Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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.core
Commits
4af6ee55
Commit
4af6ee55
authored
Nov 02, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Quickly correct slapgrid test
parent
7785e468
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
slapos/tests/slapgrid.py
slapos/tests/slapgrid.py
+3
-2
No files found.
slapos/tests/slapgrid.py
View file @
4af6ee55
...
...
@@ -707,7 +707,7 @@ class TestSlapgridCPWithMasterWatchdog(MasterMixin, unittest.TestCase):
mkdir -p etc/run &&
echo "#!/bin/sh" > etc/run/daemon &&
echo "touch launched
touch ./crashed; echo "Failing
\
\
nFailing
\
\
n"; sleep 1;
return
111;
touch ./crashed; echo "Failing
\
\
nFailing
\
\
n"; sleep 1;
exit
111;
" >> etc/run/daemon &&
chmod 755 etc/run/daemon &&
touch worked
...
...
@@ -742,6 +742,7 @@ touch worked
if
os
.
path
.
getsize
(
daemon_log
)
>
0
:
break
time
.
sleep
(
0.1
)
time
.
sleep
(
1
)
self
.
assertTrue
(
'Failing'
in
open
(
daemon_log
,
'r'
).
read
())
tries
=
200
while
tries
>
0
:
...
...
@@ -1018,7 +1019,7 @@ class TestSlapgridCPPartitionProcessing (MasterMixin, unittest.TestCase):
instance1
=
computer
.
instance_list
[
1
]
instance1
.
software
=
computer
.
software_list
[
1
]
instance0
.
software
.
setBuildout
(
"""#!/bin/sh
return
42"""
)
exit
42"""
)
self
.
launchSlapgrid
()
self
.
assertEqual
(
instance0
.
sequence
,
[
'softwareInstanceError'
])
...
...
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