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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos.toolbox
Commits
c8fc6d00
Commit
c8fc6d00
authored
Nov 24, 2014
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner resiliencytest: simplify __init__.
parent
64055fb1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
16 deletions
+4
-16
slapos/resiliencytest/suites/resiliencytestsuite.py
slapos/resiliencytest/suites/resiliencytestsuite.py
+1
-1
slapos/resiliencytest/suites/slaprunner.py
slapos/resiliencytest/suites/slaprunner.py
+3
-15
No files found.
slapos/resiliencytest/suites/resiliencytestsuite.py
View file @
c8fc6d00
...
...
@@ -48,7 +48,7 @@ class ResiliencyTestSuite(object):
computer_id
,
partition_id
,
software
,
namebase
,
root_instance_name
,
sleep_time_between_test
=
6
00
,
sleep_time_between_test
=
9
00
,
total_instance_count
=
"2"
,
type
=
None
):
self
.
server_url
=
server_url
...
...
slapos/resiliencytest/suites/slaprunner.py
View file @
c8fc6d00
...
...
@@ -45,26 +45,14 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
Run Slaprunner Resiliency Test.
It is highly suggested to read ResiliencyTestSuite code.
"""
def
__init__
(
self
,
server_url
,
key_file
,
cert_file
,
computer_id
,
partition_id
,
software
,
namebase
,
slaprunner_rootinstance_name
,
total_instance_count
=
"3"
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
# Setup urllib2 with cookie support
cookie_jar
=
cookielib
.
CookieJar
()
self
.
_opener_director
=
urllib2
.
build_opener
(
urllib2
.
HTTPCookieProcessor
(
cookie_jar
)
)
ResiliencyTestSuite
.
__init__
(
self
,
server_url
,
key_file
,
cert_file
,
computer_id
,
partition_id
,
software
,
namebase
,
slaprunner_rootinstance_name
,
1000
)
ResiliencyTestSuite
.
__init__
(
self
,
*
args
,
**
kwargs
)
def
_getPartitionParameterDict
(
self
):
"""
...
...
@@ -202,7 +190,7 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
#XXX-Nicolas: hardcoded url. Best way right now to automate the tests...
monitoring_password
=
"passwordtochange"
monitor_url
=
self
.
monitor_url
+
"?script=zero-knowledge%2Fsettings.cgi"
result
=
self
.
_opener_director
.
open
(
monitor_url
,
result
=
self
.
_opener_director
.
open
(
monitor_url
,
"password="
+
monitoring_password
+
";password_2="
+
monitoring_password
)
if
result
.
getcode
()
is
not
200
:
...
...
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