Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
moodle_rebase10.1.2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Blinov
moodle_rebase10.1.2
Commits
722a40a2
Commit
722a40a2
authored
Jun 05, 2019
by
Łukasz Nowak
Committed by
Łukasz Nowak
Jun 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend/test: Improve untilSlavePartitionReady
It is ready when all on-watch processes are not EXITED.
parent
b7f1d45b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+8
-4
No files found.
software/caddy-frontend/test/test.py
View file @
722a40a2
...
...
@@ -736,6 +736,14 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
@classmethod
def untilSlavePartitionReady(cls):
# all on-watch services shall not be exited
for process in cls.getSupervisorRPCServer()
\
.supervisor.getAllProcessInfo():
if process['
name
'].endswith('
-
on
-
watch
') and
\
process['
statename
'] == '
EXITED
':
if process['
name
'].startswith('
monitor
-
http
'):
continue
return False
for slave_reference, partition_parameter_kw in cls
\
.getSlaveParameterDictDict().items():
parameter_dict = cls.slapos_controler.slap.registerOpenOrder().request(
...
...
@@ -768,10 +776,6 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
# run partition for slaves to be setup
cls.runComputerPartitionUntil(
cls.untilSlavePartitionReady)
# run once more slapos node instance, as kedifa-updater sets up
# certificates needed for caddy-frontend, and on this moment it can be
# not started yet
cls.runComputerPartition(max_quantity=1)
for slave_reference, partition_parameter_kw in cls
\
.getSlaveParameterDictDict().items():
slave_instance = request(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment