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
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
Lu Xu
slapos.toolbox
Commits
52f41344
Commit
52f41344
authored
Oct 26, 2016
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resiliencytest: _returnNewInstanceParameter may sometimes change, even if run by test node
parent
f66a0190
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
slapos/resiliencytest/suites/erp5.py
slapos/resiliencytest/suites/erp5.py
+2
-1
slapos/resiliencytest/suites/resiliencytestsuite.py
slapos/resiliencytest/suites/resiliencytestsuite.py
+2
-2
slapos/resiliencytest/suites/slaprunner.py
slapos/resiliencytest/suites/slaprunner.py
+2
-1
No files found.
slapos/resiliencytest/suites/erp5.py
View file @
52f41344
...
@@ -242,7 +242,8 @@ class ERP5TestSuite(SlaprunnerTestSuite):
...
@@ -242,7 +242,8 @@ class ERP5TestSuite(SlaprunnerTestSuite):
old_slaprunner_backend_url
=
self
.
slaprunner_backend_url
old_slaprunner_backend_url
=
self
.
slaprunner_backend_url
self
.
slaprunner_backend_url
=
self
.
_returnNewInstanceParameter
(
self
.
slaprunner_backend_url
=
self
.
_returnNewInstanceParameter
(
parameter_key
=
'backend_url'
,
parameter_key
=
'backend_url'
,
old_parameter_value
=
old_slaprunner_backend_url
old_parameter_value
=
old_slaprunner_backend_url
,
force_new
=
True
,
)
)
self
.
_login
()
self
.
_login
()
self
.
_waitForSoftwareBuild
()
self
.
_waitForSoftwareBuild
()
...
...
slapos/resiliencytest/suites/resiliencytestsuite.py
View file @
52f41344
...
@@ -136,14 +136,14 @@ class ResiliencyTestSuite(object):
...
@@ -136,14 +136,14 @@ class ResiliencyTestSuite(object):
).
getConnectionParameterDict
()
).
getConnectionParameterDict
()
self
.
deleteTimestamp
()
self
.
deleteTimestamp
()
def
_returnNewInstanceParameter
(
self
,
parameter_key
,
old_parameter_value
):
def
_returnNewInstanceParameter
(
self
,
parameter_key
,
old_parameter_value
,
force_new
=
False
):
"""
"""
Helper, can be used inside of checkDataOnCloneInstance.
Helper, can be used inside of checkDataOnCloneInstance.
Wait for the new parameter (of old-clone new-main instance) to appear.
Wait for the new parameter (of old-clone new-main instance) to appear.
Check than it is different from the old parameter
Check than it is different from the old parameter
"""
"""
# if we are inside of a classical erp5testnode: just return the same parameter.
# if we are inside of a classical erp5testnode: just return the same parameter.
if
self
.
test_type
==
UNIT_TEST_ERP5TESTNODE
:
if
self
.
test_type
==
UNIT_TEST_ERP5TESTNODE
and
not
force_new
:
return
old_parameter_value
return
old_parameter_value
self
.
logger
.
info
(
'Waiting for new main instance to be ready...'
)
self
.
logger
.
info
(
'Waiting for new main instance to be ready...'
)
...
...
slapos/resiliencytest/suites/slaprunner.py
View file @
52f41344
...
@@ -245,7 +245,8 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
...
@@ -245,7 +245,8 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
old_slaprunner_backend_url
=
self
.
slaprunner_backend_url
old_slaprunner_backend_url
=
self
.
slaprunner_backend_url
self
.
slaprunner_backend_url
=
self
.
_returnNewInstanceParameter
(
self
.
slaprunner_backend_url
=
self
.
_returnNewInstanceParameter
(
parameter_key
=
'backend-url'
,
parameter_key
=
'backend-url'
,
old_parameter_value
=
old_slaprunner_backend_url
old_parameter_value
=
old_slaprunner_backend_url
,
force_new
=
True
,
)
)
self
.
_login
()
self
.
_login
()
self
.
_waitForSoftwareBuild
()
self
.
_waitForSoftwareBuild
()
...
...
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