Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Titouan Soulard
slapos
Commits
b7a2dc55
Commit
b7a2dc55
authored
Apr 22, 2020
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! slaprunner: test support of multiple software release
parent
948f5f54
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
software/slaprunner/test/test.py
software/slaprunner/test/test.py
+3
-1
No files found.
software/slaprunner/test/test.py
View file @
b7a2dc55
...
...
@@ -36,6 +36,7 @@ import subprocess
import
time
import
unittest
from
datetime
import
datetime
from
lxml
import
etree
from
lxml.html
import
soupparser
...
...
@@ -359,6 +360,7 @@ class TestSlapProxyIntegration(SlaprunnerTestCase):
return
resp
def
_buildAndRun
(
self
):
start_date
=
datetime
.
now
().
strftime
(
'%Y-%m-%d %H:%M:%S'
)
self
.
logger
.
debug
(
'Running Build&Run'
)
self
.
_call
(
'runSoftwareProfile'
)
while
True
:
...
...
@@ -376,7 +378,7 @@ class TestSlapProxyIntegration(SlaprunnerTestCase):
continue
if
result
[
'software'
][
'success'
]
==
0
:
if
result
[
'instance'
][
'success'
]
==
0
:
if
result
[
'instance'
][
'success'
]
==
0
and
start_date
<
result
[
'instance'
][
'last_build'
].
encode
()
:
self
.
logger
.
debug
(
'Instance is up!'
)
# Done
return
...
...
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