Merge lp:~benji/juju-gui/sandboxify-tests into lp:juju-gui/experimental
Proposed by
Benji York
Status: | Work in progress |
---|---|
Proposed branch: | lp:~benji/juju-gui/sandboxify-tests |
Merge into: | lp:juju-gui/experimental |
Diff against target: |
299 lines (+130/-75) 6 files modified
HACKING (+1/-1) Makefile (+30/-5) test/browser.py (+1/-2) test/test_browser.py (+95/-0) test/test_charm_running.py (+2/-67) test/test_deploy_charm_for_testing.py (+1/-0) |
To merge this branch: | bzr merge lp:~benji/juju-gui/sandboxify-tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+198410@code.launchpad.net |
Description of the change
Add the ability to run local browser tests.
Some existing tests were moved from charm-requiring tests to local browser
tests.
To post a comment you must log in.
Unmerged revisions
- 1224. By Benji York
-
words
- 1223. By Benji York
-
reinstate tests
- 1222. By Benji York
-
abandon hope of starting the server automatically
- 1221. By Benji York
-
checkpoint
- 1220. By Benji York
-
merge from trunk
- 1219. By Benji York
-
checkpoint
Reviewers: mp+198410_ code.launchpad. net,
Message:
Pre-review comments.
https:/ /codereview. appspot. com/40190043/ diff/1/ Makefile
File Makefile (right):
https:/ /codereview. appspot. com/40190043/ diff/1/ Makefile# newcode408
Makefile:408: # of this target when called by lbox. Please do not
change.
Typo fix, I think.
https:/ /codereview. appspot. com/40190043/ diff/1/ Makefile# newcode445 bin/python websocketreplay .py
Makefile:445: PYTHONPATH=lib virtualenv/
test/test_
We were using the system Python here.
https:/ /codereview. appspot. com/40190043/ diff/1/ Makefile# newcode458
Makefile:458: # Wait for the display to be accessible.
Avoid racing with Xvfb to start up.
https:/ /codereview. appspot. com/40190043/ diff/1/ test/browser. py
File test/browser.py (left):
https:/ /codereview. appspot. com/40190043/ diff/1/ test/browser. py#oldcode214 py:214: printerr('* Platform: local get_platform( driver) ))
test/browser.
{}'.format(
This was annoying and non-useful.
https:/ /codereview. appspot. com/40190043/ diff/1/ test/test_ browser. py browser. py (right):
File test/test_
https:/ /codereview. appspot. com/40190043/ diff/1/ test/test_ browser. py#newcode1 browser. py:1: # This file is part of the Juju GUI, which lets
test/test_
users view and manage Juju
These tests were moved here, unchanged.
https:/ /codereview. appspot. com/40190043/ diff/1/ test/test_ charm_running. py charm_running. py (left):
File test/test_
https:/ /codereview. appspot. com/40190043/ diff/1/ test/test_ charm_running. py#oldcode25 charm_running. py:25: class TestBasics( browser. TestCase) :
test/test_
These were moved elsewhere.
https:/ /codereview. appspot. com/40190043/ diff/1/ test/test_ charm_running. py#oldcode277 charm_running. py:277: class ion(browser. TestCase) :
test/test_
TestAuthenticat
Moved.
https:/ /codereview. appspot. com/40190043/ diff/1/ test/test_ charm_running. py charm_running. py (right):
File test/test_
https:/ /codereview. appspot. com/40190043/ diff/1/ test/test_ charm_running. py#newcode192 charm_running. py:192: self.deploy( 'mysql' )
test/test_
This change made the tests start working when the GUI is not run from a
charm (as in the sandbox).
Description:
Add the ability to run local browser tests.
Some existing tests were moved from charm-requiring tests to local
browser
tests.
https:/ /code.launchpad .net/~benji/ juju-gui/ sandboxify- tests/+ merge/198410
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/40190043/
Affected files (+131, -74 lines): browser. py browser_ errors. py charm_running. py deploy_ charm_for_ testing. py
M HACKING
M Makefile
A [revision details]
M test/browser.py
A test/test_
M test/test_
M test/test_
M test/test_