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
Xiaowu Zhang
slapos
Commits
8850e5dc
Commit
8850e5dc
authored
Dec 16, 2016
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[HARDCODED] Report test results before trying to quit the browser
parent
25fe36f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/template/run-zelenium-test.py.in
stack/erp5/template/run-zelenium-test.py.in
+7
-7
No files found.
stack/erp5/buildout.cfg
View file @
8850e5dc
...
...
@@ -156,7 +156,7 @@ mode = 755
[template-run-zelenium]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template/run-zelenium-test.py.in
md5sum =
ab554dc5e57b8002e51b0f86074311a3
md5sum =
09706bcdb2b7de1ba997b81a4778e6db
output = ${buildout:directory}/run-zelenium-test.py.in
mode = 755
...
...
stack/erp5/template/run-zelenium-test.py.in
View file @
8850e5dc
...
...
@@ -213,13 +213,6 @@ def main():
'stdout': agent,
'stderr': traceback.format_exc()
}
finally:
if is_browser_running:
# if by any chance browser is still running due to
# traceback raised make sure we cleanup
browser.quit()
try:
test_result = tool.createTestResult(revision = revision,
...
...
@@ -239,6 +232,7 @@ def main():
print 'Submitting: "%s"' % test_result_line.name
# report status back to Nexedi ERP5
test_result_line.stop(**test_line_dict[test_result_line.name])
except:
# Catch any exception here, to warn user instead of being silent,
# by generating fake error result
...
...
@@ -250,6 +244,12 @@ def main():
# XXX: inform test node master of error
raise EnvironmentError(result)
finally:
if is_browser_running:
# if by any chance browser is still running due to
# traceback raised make sure we cleanup
browser.quit()
if __name__ == "__main__":
main()
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