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
Eugene Shen
erp5
Commits
318841ae
Commit
318841ae
authored
Jul 30, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scalability: use new user file
parent
4f09471c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
11 deletions
+7
-11
erp5/util/benchmark/examples/userInfo.py
erp5/util/benchmark/examples/userInfo.py
+1
-6
erp5/util/scalability/runScalabilityTestSuite.py
erp5/util/scalability/runScalabilityTestSuite.py
+3
-5
tests/__init__.py
tests/__init__.py
+3
-0
No files found.
erp5/util/benchmark/examples/userInfo.py
View file @
318841ae
# Specify user login/password used to run the tests. Note that there must be
# Specify user login/password used to run the tests. Note that there must be
# the same number of users specified here *and* on the script command-line.
# the same number of users specified here *and* on the script command-line.
user_tuple
=
(
user_tuple
=
(
(
'scalability_user'
,
'insecure'
),
(
'zope'
,
'insecure'
),
(
'scalability_user'
,
'insecure'
),
(
'scalability_user'
,
'insecure'
),
(
'scalability_user'
,
'insecure'
),
(
'scalability_user'
,
'insecure'
),
)
)
# A more complex example setting the source IP address as well, assuming the
# A more complex example setting the source IP address as well, assuming the
...
...
erp5/util/scalability/runScalabilityTestSuite.py
View file @
318841ae
...
@@ -274,9 +274,7 @@ class ScalabilityLauncher(object):
...
@@ -274,9 +274,7 @@ class ScalabilityLauncher(object):
# Get suite informations
# Get suite informations
suite
=
makeSuite
(
self
.
__argumentNamespace
.
test_suite
,
self
.
log
)
suite
=
makeSuite
(
self
.
__argumentNamespace
.
test_suite
,
self
.
log
)
test_suites
=
suite
.
getTestList
()
test_suites
=
suite
.
getTestList
()
test_path
=
suite
.
getTestPath
()
while
time
.
time
()
-
start_time
<
max_time
:
while
time
.
time
()
-
start_time
<
max_time
:
time
.
sleep
(
5
)
time
.
sleep
(
5
)
...
@@ -296,9 +294,9 @@ class ScalabilityLauncher(object):
...
@@ -296,9 +294,9 @@ class ScalabilityLauncher(object):
current_test_number
=
int
(
current_test
.
title
)
current_test_number
=
int
(
current_test
.
title
)
test_duration
=
suite
.
getTestDuration
(
current_test_number
)
test_duration
=
suite
.
getTestDuration
(
current_test_number
)
benchmark_path_list
=
os
.
path
.
join
(
self
.
__argumentNamespace
.
erp5_location
,
test_path
)
benchmark_path_list
=
os
.
path
.
join
(
self
.
__argumentNamespace
.
erp5_location
,
suite
.
getTestPath
()
)
#TODO: generate a basic user file with all scalability users.
#TODO: generate a basic user file with all scalability users.
user_file_path
=
os
.
path
.
join
(
self
.
__argumentNamespace
.
erp5_location
,
test_path
)
user_file_path
=
os
.
path
.
join
(
self
.
__argumentNamespace
.
erp5_location
,
suite
.
getUsersFilePath
()
)
tester_path
=
self
.
__argumentNamespace
.
runner_path
tester_path
=
self
.
__argumentNamespace
.
runner_path
user_number
=
suite
.
getUserNumber
(
current_test_number
)
user_number
=
suite
.
getUserNumber
(
current_test_number
)
...
...
tests/__init__.py
View file @
318841ae
...
@@ -132,6 +132,9 @@ class ERP5_scalability(_ERP5):
...
@@ -132,6 +132,9 @@ class ERP5_scalability(_ERP5):
def
getTestPath
(
self
):
def
getTestPath
(
self
):
return
'erp5/util/benchmark/examples/'
return
'erp5/util/benchmark/examples/'
def
getUsersFilePath
(
self
):
return
'erp5/util/benchmark/examples/scalabilityUsers'
def
getUserNumber
(
self
,
test_number
):
def
getUserNumber
(
self
,
test_number
):
user_number
=
1
user_number
=
1
...
...
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