Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
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
Hamza
erp5-Boxiang
Commits
806f1c72
Commit
806f1c72
authored
Jul 29, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testnode: SlapOSMasterCommunicator: rename methods
parent
76331189
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+1
-1
erp5/util/testnode/SlapOSMasterCommunicator.py
erp5/util/testnode/SlapOSMasterCommunicator.py
+3
-3
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
806f1c72
...
@@ -205,7 +205,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -205,7 +205,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
"""
"""
self
.
log
(
"Wait for instance state: %s"
%
state
)
self
.
log
(
"Wait for instance state: %s"
%
state
)
start_time
=
time
.
time
()
start_time
=
time
.
time
()
while
(
not
self
.
slapos_communicator
.
isHostingSubscription
Correctl
y
(
instance_title
,
state
)
while
(
not
self
.
slapos_communicator
.
isHostingSubscription
Read
y
(
instance_title
,
state
)
and
(
max_time
>
(
time
.
time
()
-
start_time
))):
and
(
max_time
>
(
time
.
time
()
-
start_time
))):
time
.
sleep
(
15
)
time
.
sleep
(
15
)
if
(
time
.
time
()
-
start_time
)
>
max_time
:
if
(
time
.
time
()
-
start_time
)
>
max_time
:
...
...
erp5/util/testnode/SlapOSMasterCommunicator.py
View file @
806f1c72
...
@@ -139,7 +139,7 @@ class SlapOSMasterCommunicator(object):
...
@@ -139,7 +139,7 @@ class SlapOSMasterCommunicator(object):
return
False
return
False
return
len
(
related_instance_link_list
)
>
0
return
len
(
related_instance_link_list
)
>
0
def
isInstance
Correctl
y
(
self
,
instance_link
,
status
):
def
isInstance
Read
y
(
self
,
instance_link
,
status
):
"""
"""
Return True if instance status and instance news text ~looks corresponding.
Return True if instance status and instance news text ~looks corresponding.
( use the matching of 'correctly' and 'Instance' and status )
( use the matching of 'correctly' and 'Instance' and status )
...
@@ -148,14 +148,14 @@ class SlapOSMasterCommunicator(object):
...
@@ -148,14 +148,14 @@ class SlapOSMasterCommunicator(object):
return
(
'Instance'
in
text
)
and
(
'correctly'
in
text
)
and
(
status
in
text
)
return
(
'Instance'
in
text
)
and
(
'correctly'
in
text
)
and
(
status
in
text
)
# check if provided 'status' = status
# check if provided 'status' = status
def
isHostingSubscription
Correctl
y
(
self
,
hosting_subscription_title
,
status
):
def
isHostingSubscription
Read
y
(
self
,
hosting_subscription_title
,
status
):
"""
"""
Return True if all instance status and instance news text ~looks corresponding.
Return True if all instance status and instance news text ~looks corresponding.
( use the matching of 'correctly' and 'Instance' and status ).
( use the matching of 'correctly' and 'Instance' and status ).
"""
"""
instance_link_list
=
self
.
_getRelatedInstanceLink
(
hosting_subscription_title
)
instance_link_list
=
self
.
_getRelatedInstanceLink
(
hosting_subscription_title
)
for
instance_link
in
instance_link_list
:
for
instance_link
in
instance_link_list
:
if
not
self
.
isInstance
Correctl
y
(
instance_link
,
status
):
if
not
self
.
isInstance
Read
y
(
instance_link
,
status
):
return
False
return
False
return
len
(
instance_link_list
)
>
0
return
len
(
instance_link_list
)
>
0
...
...
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