1
=== modified file 'src/maasserver/clusterrpc/tests/test_power_parameters.py'
2
--- src/maasserver/clusterrpc/tests/test_power_parameters.py	2014-08-13 21:49:35 +0000
3
+++ src/maasserver/clusterrpc/tests/test_power_parameters.py	2014-09-03 09:16:13 +0000
4
@@ -29,12 +29,10 @@
5
29
from maasserver.config_forms import DictCharField
29
from maasserver.config_forms import DictCharField
6
30
from maasserver.fields import MACAddressFormField
30
from maasserver.fields import MACAddressFormField
7
31
from maasserver.testing.factory import factory
31
from maasserver.testing.factory import factory
12
32
from maasserver.testing.testcase import (
32
from maasserver.testing.testcase import MAASServerTestCase
9
33
    MAASServerTestCase,
10
34
    MAASTestCase,
11
35
    )
13
36
from maasserver.utils.forms import compose_invalid_choice_text
33
from maasserver.utils.forms import compose_invalid_choice_text
14
37
from maastesting.matchers import MockCalledOnceWith
34
from maastesting.matchers import MockCalledOnceWith
15
35
from maastesting.testcase import MAASTestCase
16
38
from mock import sentinel
36
from mock import sentinel
17
39
from provisioningserver.power.poweraction import PowerAction
37
from provisioningserver.power.poweraction import PowerAction
18
40
from provisioningserver.power_schema import (
38
from provisioningserver.power_schema import (
19
41
39
20
=== modified file 'src/maasserver/testing/testcase.py'
21
--- src/maasserver/testing/testcase.py	2014-08-16 10:16:57 +0000
22
+++ src/maasserver/testing/testcase.py	2014-09-03 09:16:13 +0000
23
@@ -39,7 +39,9 @@
24
39
    DjangoTestCase,
39
    DjangoTestCase,
25
40
    )
40
    )
26
41
from maastesting.fixtures import DisplayFixture
41
from maastesting.fixtures import DisplayFixture
28
42
from maastesting.testcase import MAASTestCase
42
# XXX bigjools 2014-09-03 bug=1364713
29
43
# tests disabled while waiting for new selenium.
30
44
#from maastesting.testcase import MAASTestCase
31
43
from maastesting.utils import run_isolated
45
from maastesting.utils import run_isolated
32
44
from mock import Mock
46
from mock import Mock
33
45
import provisioningserver
47
import provisioningserver
34
@@ -137,7 +139,10 @@
35
137
        wsgiref.handlers.BaseHandler.log_exception = self.old_log_exception
139
        wsgiref.handlers.BaseHandler.log_exception = self.old_log_exception
36
138
140
37
139
141
39
140
class SeleniumTestCase(MAASTestCase, LiveServerTestCase):
142
# XXX bigjools 2014-09-03 bug=1364713
40
143
# All tests disabled while waiting for new selenium.
41
144
#class SeleniumTestCase(MAASTestCase, LiveServerTestCase):
42
145
class SeleniumTestCase:
43
141
    """Selenium-enabled test case.
146
    """Selenium-enabled test case.
44
142
147
45
143
    Two users are pre-created: "user" for a regular user account, or "admin"
148
    Two users are pre-created: "user" for a regular user account, or "admin"
46
144
149
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-03 09:16:13 +0000
50
@@ -166,7 +166,10 @@
51
166
            self.fail(message)
166
            self.fail(message)
52
167
167
53
168
168
55
169
class YUIUnitTestsLocal(YUIUnitTestsBase, MAASTestCase):
169
# XXX bigjools 2014-09-03 bug=1364713
56
170
# Disabled while waiting for new selenium.
57
171
#class YUIUnitTestsLocal(YUIUnitTestsBase, MAASTestCase):
58
172
class YUIUnitTestsLocal:
59
170
173
60
171
    scenarios = tuple(
174
    scenarios = tuple(
61
172
        (relpath(path, root), {"test_url": "file://%s" % abspath(path)})
175
        (relpath(path, root), {"test_url": "file://%s" % abspath(path)})
Status:	Merged
Approved by:	Julian Edwards on 2014-09-03
Approved revision:	no longer in the source branch.
Merged at revision:	2882
Proposed branch:	lp:~julian-edwards/maas/disabletests
Merge into:	lp:~maas-committers/maas/trunk
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:~julian-edwards/maas/disabletests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)			Approve on 2014-09-03
Review via email: mp+233148@code.launchpad.net