Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
slapos.toolbox
Commits
2b6466c0
Commit
2b6466c0
authored
Jun 20, 2019
by
Bryton Lacquement
🚪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wip
parent
d38c7287
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
slapos/test/monitor/testrunpromise.py
slapos/test/monitor/testrunpromise.py
+1
-1
slapos/test/promise/plugin/test_check_url_available.py
slapos/test/promise/plugin/test_check_url_available.py
+3
-2
No files found.
slapos/test/monitor/testrunpromise.py
View file @
2b6466c0
...
@@ -174,9 +174,9 @@ class RunPromise(GenericPromise):
...
@@ -174,9 +174,9 @@ class RunPromise(GenericPromise):
u'result'
:
{
u'result'
:
{
u'failed'
:
False
,
u'message'
:
u'success'
,
u'type'
:
u'Test Result'
u'failed'
:
False
,
u'message'
:
u'success'
,
u'type'
:
u'Test Result'
},
},
u'execution-time'
:
0.05
,
u'path'
:
u'%s/my_second_promise.py'
%
self
.
promise_dir
,
u'path'
:
u'%s/my_second_promise.py'
%
self
.
promise_dir
,
}
}
self
.
assertIsNotNone
(
second_result
.
pop
(
u'execution-time'
,
None
))
self
.
assertEqual
(
expected_result
,
second_result
)
self
.
assertEqual
(
expected_result
,
second_result
)
def
test_promise_generic_failed
(
self
):
def
test_promise_generic_failed
(
self
):
...
...
slapos/test/promise/plugin/test_check_url_available.py
View file @
2b6466c0
...
@@ -197,6 +197,7 @@ class CheckUrlAvailableMixin(TestPromisePluginMixin):
...
@@ -197,6 +197,7 @@ class CheckUrlAvailableMixin(TestPromisePluginMixin):
def
tearDownClass
(
cls
):
def
tearDownClass
(
cls
):
cls
.
server_process
.
terminate
()
cls
.
server_process
.
terminate
()
cls
.
server_process
.
join
()
cls
.
server_process
.
join
()
if
six
.
PY3
:
# In Py3, the server socket does not seem to be automatically closed.
# In Py3, the server socket does not seem to be automatically closed.
cls
.
server_process
.
_target
.
__self__
.
socket
.
close
()
cls
.
server_process
.
_target
.
__self__
.
socket
.
close
()
for
p
in
[
for
p
in
[
...
...
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