Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hub
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
thomasDOTwtf
hub
Commits
f993a758
Commit
f993a758
authored
Dec 18, 2021
by
Andreas Hubel
Browse files
Options
Downloads
Patches
Plain Diff
schedule support: add local file adapter for tests
parent
8547ace8
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/core/schedules/schedulejson.py
+6
-2
6 additions, 2 deletions
src/core/schedules/schedulejson.py
src/core/schedules/schedulexml.py
+8
-6
8 additions, 6 deletions
src/core/schedules/schedulexml.py
src/core/tests/schedules.py
+2
-2
2 additions, 2 deletions
src/core/tests/schedules.py
with
16 additions
and
10 deletions
src/core/schedules/schedulejson.py
+
6
−
2
View file @
f993a758
from
collections
import
OrderedDict
from
collections
import
OrderedDict
import
json
import
json
import
requests
import
requests
from
requests_file
import
FileAdapter
from
api.views.schedule
import
filter_additional_data
,
schedulexml_time_to_timedelta
from
api.views.schedule
import
filter_additional_data
,
schedulexml_time_to_timedelta
from
.base
import
BaseScheduleSupport
from
.base
import
BaseScheduleSupport
# from ...api.schedule import Schedule
# from ...api.schedule import Schedule
s
=
requests
.
Session
()
s
.
mount
(
'
file://
'
,
FileAdapter
())
class
ScheduleJSONSupport
(
BaseScheduleSupport
):
class
ScheduleJSONSupport
(
BaseScheduleSupport
):
identifier
=
'
schedule-json
'
identifier
=
'
schedule-json
'
...
@@ -15,7 +19,7 @@ class ScheduleJSONSupport(BaseScheduleSupport):
...
@@ -15,7 +19,7 @@ class ScheduleJSONSupport(BaseScheduleSupport):
configuration_fields
=
None
configuration_fields
=
None
def
ready
(
self
):
def
ready
(
self
):
r
=
request
s
.
head
(
self
.
remote_url
)
r
=
s
.
head
(
self
.
remote_url
)
return
r
.
ok
return
r
.
ok
def
fetch
(
self
):
def
fetch
(
self
):
...
@@ -74,7 +78,7 @@ class ScheduleJSON:
...
@@ -74,7 +78,7 @@ class ScheduleJSON:
@classmethod
@classmethod
def
from_url
(
cls
,
url
):
def
from_url
(
cls
,
url
):
r
=
request
s
.
get
(
url
)
r
=
s
.
get
(
url
)
if
r
.
ok
is
False
:
if
r
.
ok
is
False
:
raise
Exception
(
'
Request failed, HTTP {0}.
'
.
format
(
r
.
status_code
))
raise
Exception
(
'
Request failed, HTTP {0}.
'
.
format
(
r
.
status_code
))
...
...
This diff is collapsed.
Click to expand it.
src/core/schedules/schedulexml.py
+
8
−
6
View file @
f993a758
from
django.utils.dateparse
import
parse_datetime
import
requests
import
collections
import
collections
import
datetime
import
datetime
from
django.utils.dateparse
import
parse_datetime
import
requests
from
requests_file
import
FileAdapter
from
xml.etree.ElementTree
import
ElementTree
from
xml.etree.ElementTree
import
ElementTree
from
api.views.schedule
import
filter_additional_data
,
schedulexml_time_to_timedelta
from
api.views.schedule
import
filter_additional_data
,
schedulexml_time_to_timedelta
from
.base
import
BaseScheduleSupport
from
.base
import
BaseScheduleSupport
# from ...api.schedule import Schedule
s
=
requests
.
Session
()
s
.
mount
(
'
file://
'
,
FileAdapter
())
class
ScheduleXMLSupport
(
BaseScheduleSupport
):
class
ScheduleXMLSupport
(
BaseScheduleSupport
):
...
@@ -17,7 +20,7 @@ class ScheduleXMLSupport(BaseScheduleSupport):
...
@@ -17,7 +20,7 @@ class ScheduleXMLSupport(BaseScheduleSupport):
configuration_fields
=
None
configuration_fields
=
None
def
ready
(
self
):
def
ready
(
self
):
r
=
request
s
.
head
(
self
.
remote_url
)
r
=
s
.
head
(
self
.
remote_url
)
return
r
.
ok
return
r
.
ok
def
fetch
(
self
):
def
fetch
(
self
):
...
@@ -73,12 +76,11 @@ class ScheduleXML:
...
@@ -73,12 +76,11 @@ class ScheduleXML:
tz
=
None
tz
=
None
def
__init__
(
self
,
tree
):
def
__init__
(
self
,
tree
):
# self.tz = pytz.timezone()
self
.
_schedule
=
tree
self
.
_schedule
=
tree
@classmethod
@classmethod
def
from_url
(
cls
,
url
):
def
from_url
(
cls
,
url
):
r
=
request
s
.
get
(
url
)
r
=
s
.
get
(
url
)
if
r
.
ok
is
False
:
if
r
.
ok
is
False
:
raise
Exception
(
'
Request failed, HTTP {0}.
'
.
format
(
r
.
status_code
))
raise
Exception
(
'
Request failed, HTTP {0}.
'
.
format
(
r
.
status_code
))
...
...
This diff is collapsed.
Click to expand it.
src/core/tests/schedules.py
+
2
−
2
View file @
f993a758
...
@@ -110,7 +110,7 @@ class ScheduleTests(TestCase):
...
@@ -110,7 +110,7 @@ class ScheduleTests(TestCase):
src
=
ScheduleSource
.
objects
.
create
(
src
=
ScheduleSource
.
objects
.
create
(
assembly
=
self
.
assembly
,
assembly
=
self
.
assembly
,
import_type
=
ScheduleXMLSupport
.
identifier
,
import_type
=
ScheduleXMLSupport
.
identifier
,
import_url
=
'
file://import_data/schedule-2021.xml
'
,
import_url
=
'
file://
/
import_data/schedule-2021.xml
'
,
)
)
self
.
assertFalse
(
src
.
has_running_import
)
self
.
assertFalse
(
src
.
has_running_import
)
...
@@ -155,7 +155,7 @@ class ScheduleTests(TestCase):
...
@@ -155,7 +155,7 @@ class ScheduleTests(TestCase):
src
=
ScheduleSource
.
objects
.
create
(
src
=
ScheduleSource
.
objects
.
create
(
assembly
=
self
.
assembly
,
assembly
=
self
.
assembly
,
import_type
=
ScheduleJSONSupport
.
identifier
,
import_type
=
ScheduleJSONSupport
.
identifier
,
import_url
=
'
file://import_data/schedule-2021.json
'
,
import_url
=
'
file://
/
import_data/schedule-2021.json
'
,
)
)
self
.
assertFalse
(
src
.
has_running_import
)
self
.
assertFalse
(
src
.
has_running_import
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment