Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Tristan Cavelier
slapos
Commits
2c487999
Commit
2c487999
authored
Nov 04, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Remove useless user/password in URLs"
This reverts commit
5f070b93
.
parent
a5547df5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
slapos/recipe/seleniumrunner/testrunner.py
slapos/recipe/seleniumrunner/testrunner.py
+5
-5
No files found.
slapos/recipe/seleniumrunner/testrunner.py
View file @
2c487999
...
@@ -35,7 +35,8 @@ import urllib2
...
@@ -35,7 +35,8 @@ import urllib2
def
run
(
args
):
def
run
(
args
):
config
=
args
[
0
]
config
=
args
[
0
]
test_url
=
assembleTestUrl
(
config
[
'base_url'
],
config
[
'suite_name'
])
test_url
=
assembleTestUrl
(
config
[
'base_url'
],
config
[
'suite_name'
],
config
[
'user'
],
config
[
'password'
])
# There is no test that can take more them 24 hours
# There is no test that can take more them 24 hours
timeout
=
2.0
*
60
*
60
timeout
=
2.0
*
60
*
60
...
@@ -44,7 +45,6 @@ def run(args):
...
@@ -44,7 +45,6 @@ def run(args):
erp5_report
=
ERP5TestReportHandler
(
config
[
'test_report_instance_url'
],
erp5_report
=
ERP5TestReportHandler
(
config
[
'test_report_instance_url'
],
config
[
'project'
]
+
'@'
+
config
[
'suite_name'
])
config
[
'project'
]
+
'@'
+
config
[
'suite_name'
])
# Clean old test results
# Clean old test results
# TODO send user/pass in POST
openUrl
(
'%s/TestTool_cleanUpTestResults?__ac_name=%s&__ac_password=%s'
%
(
openUrl
(
'%s/TestTool_cleanUpTestResults?__ac_name=%s&__ac_password=%s'
%
(
config
[
'base_url'
],
config
[
'user'
],
config
[
'password'
]))
config
[
'base_url'
],
config
[
'user'
],
config
[
'password'
]))
# TODO assert getresult is None
# TODO assert getresult is None
...
@@ -100,11 +100,11 @@ def getStatus(url):
...
@@ -100,11 +100,11 @@ def getStatus(url):
raise
raise
return
status
return
status
def
assembleTestUrl
(
base_url
,
suite_name
):
def
assembleTestUrl
(
base_url
,
suite_name
,
user
,
password
):
"""
"""
Create the full url to the testrunner
Create the full url to the testrunner
"""
"""
test_url
=
"%s/%s/core/TestRunner.html?test=../test_suite_html&"
\
test_url
=
"%s/%s/core/TestRunner.html?test=../test_suite_html&"
\
"resultsUrl=%s/postResults&auto=on"
%
(
"resultsUrl=%s/postResults&auto=on
&__ac_name=%s&__ac_password=%s
"
%
(
base_url
,
suite_name
,
base_url
)
base_url
,
suite_name
,
base_url
,
user
,
password
)
return
test_url
return
test_url
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