Merge lp:~newell-jensen/maas/1.5-disable-selenium-tests into lp:maas/1.5

Proposed by Newell Jensen on 2014-09-30
Status: Merged
Approved by: Newell Jensen on 2014-09-30
Approved revision: 2297
Merged at revision: 2297
Proposed branch: lp:~newell-jensen/maas/1.5-disable-selenium-tests
Merge into: lp:maas/1.5
Diff against target: 61 lines (+13/-7)
3 files modified
src/maasserver/clusterrpc/tests/test_power_parameters.py (+2/-4)
src/maasserver/testing/testcase.py (+7/-2)
src/maasserver/tests/test_js.py (+4/-1)
To merge this branch: bzr merge lp:~newell-jensen/maas/1.5-disable-selenium-tests
Reviewer Review Type Date Requested Status
Newell Jensen Approve on 2014-09-30
Review via email: mp+236449@code.launchpad.net

Commit message

Backport r2882: Firefox has been updated which has broken selenium tests; disable them until the selenium package is updated.

To post a comment you must log in.
Newell Jensen (newell-jensen) wrote :

Backport. Self-review.

review: Needs Fixing
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/clusterrpc/tests/test_power_parameters.py'
2--- src/maasserver/clusterrpc/tests/test_power_parameters.py 2014-03-17 15:15:53 +0000
3+++ src/maasserver/clusterrpc/tests/test_power_parameters.py 2014-09-30 04:50:27 +0000
4@@ -29,12 +29,10 @@
5 from maasserver.config_forms import DictCharField
6 from maasserver.fields import MACAddressFormField
7 from maasserver.testing.factory import factory
8-from maasserver.testing.testcase import (
9- MAASServerTestCase,
10- MAASTestCase,
11- )
12+from maasserver.testing.testcase import MAASServerTestCase
13 from maasserver.utils.forms import compose_invalid_choice_text
14 from maastesting.matchers import MockCalledOnceWith
15+from maastesting.testcase import MAASTestCase
16 from mock import sentinel
17 from provisioningserver.power.poweraction import PowerAction
18 from provisioningserver.power_schema import (
19
20=== modified file 'src/maasserver/testing/testcase.py'
21--- src/maasserver/testing/testcase.py 2014-03-19 18:13:14 +0000
22+++ src/maasserver/testing/testcase.py 2014-09-30 04:50:27 +0000
23@@ -39,7 +39,9 @@
24 DjangoTestCase,
25 )
26 from maastesting.fixtures import DisplayFixture
27-from maastesting.testcase import MAASTestCase
28+# XXX bigjools 2014-09-03 bug=1364713
29+# tests disabled while waiting for new selenium.
30+#from maastesting.testcase import MAASTestCase
31 from maastesting.utils import run_isolated
32 from mock import Mock
33 import provisioningserver
34@@ -139,7 +141,10 @@
35 wsgiref.handlers.BaseHandler.log_exception = self.old_log_exception
36
37
38-class SeleniumTestCase(MAASTestCase, LiveServerTestCase):
39+# XXX bigjools 2014-09-03 bug=1364713
40+# All tests disabled while waiting for new selenium.
41+#class SeleniumTestCase(MAASTestCase, LiveServerTestCase):
42+class SeleniumTestCase:
43 """Selenium-enabled test case.
44
45 Two users are pre-created: "user" for a regular user account, or "admin"
46
47=== modified file 'src/maasserver/tests/test_js.py'
48--- src/maasserver/tests/test_js.py 2014-01-08 17:12:10 +0000
49+++ src/maasserver/tests/test_js.py 2014-09-30 04:50:27 +0000
50@@ -166,7 +166,10 @@
51 self.fail(message)
52
53
54-class YUIUnitTestsLocal(YUIUnitTestsBase, MAASTestCase):
55+# XXX bigjools 2014-09-03 bug=1364713
56+# Disabled while waiting for new selenium.
57+#class YUIUnitTestsLocal(YUIUnitTestsBase, MAASTestCase):
58+class YUIUnitTestsLocal:
59
60 scenarios = tuple(
61 (relpath(path, root), {"test_url": "file://%s" % abspath(path)})

Subscribers

People subscribed via source and target branches

to all changes: