Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
francois
erp5
Commits
a3c074d7
Commit
a3c074d7
authored
Aug 01, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testnode: ScalabilityTestRunne: Fix typo
parent
5461b283
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+4
-4
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+5
-1
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
a3c074d7
...
...
@@ -209,20 +209,20 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
and
(
max_time
>
(
time
.
time
()
-
start_time
))):
time
.
sleep
(
15
)
if
(
time
.
time
()
-
start_time
)
>
max_time
:
raise
ValueError
(
"Instance '%s' not '%s' after %s seconds"
%
(
title
,
state
))
raise
ValueError
(
"Instance '%s' not '%s' after %s seconds"
%
(
instance_
title
,
state
))
self
.
log
(
"Instance correctly '%s' after %s seconds."
%
(
state
,
str
(
time
.
time
()
-
start_time
)))
def
_waitInstanceCreation
(
self
,
title
,
max_time
=
MAX_CREATION_INSTANCE_TIME
):
def
_waitInstanceCreation
(
self
,
instance_
title
,
max_time
=
MAX_CREATION_INSTANCE_TIME
):
"""
Wait for 'max_time' the instance creation
"""
self
.
log
(
"Wait for instance creation"
)
start_time
=
time
.
time
()
while
(
not
self
.
slapos_communicator
.
isRegisteredHostingSubscription
(
title
)
\
while
(
not
self
.
slapos_communicator
.
isRegisteredHostingSubscription
(
instance_
title
)
\
and
(
max_time
>
(
time
.
time
()
-
start_time
))
):
time
.
sleep
(
5
)
if
(
time
.
time
()
-
start_time
)
>
max_time
:
raise
ValueError
(
"Instance '%s' not found after %s seconds"
%
(
title
,
max_time
))
raise
ValueError
(
"Instance '%s' not found after %s seconds"
%
(
instance_
title
,
max_time
))
self
.
log
(
"Instance found on slapOSMaster"
)
def
prepareSlapOSForTestSuite
(
self
,
node_test_suite
):
...
...
erp5/util/testnode/testnode.py
View file @
a3c074d7
...
...
@@ -383,7 +383,11 @@ from the distributor.")
# as partitions can be of any kind we have and likely will never have
# a reliable way to check if they are up or not ...
#time.sleep(20)
if
status_dict
[
'status_code'
]
==
0
:
runner
.
runTestSuite
(
node_test_suite
,
portal_url
)
else
:
#TODO: do a fail on test result
pass
# break the loop to get latest priorities from master
break
self
.
cleanUp
(
test_result
)
...
...
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