← Back to branch summary

~allenap/maas/duplicate-vlan-on-start--bug-1583333

« back to all changes in this revision

Viewing changes to src/maasserver/api/tests/test_boot_source_selections.py

  • Committer: Gavin Panella
  • Date: 2016-05-31 19:15:43 UTC
  • mfrom: (5050.1.5 maas)
  • Revision ID: gavin.panella@canonical.com-20160531191543-xkc3267agjrjl1rn
Merged trunk into duplicate-vlan-on-start--bug-1583333.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/api/tests/test_boot_source_selections.py
12
12
    DISPLAYED_BOOTSOURCESELECTION_FIELDS,
13
13
)
14
14
from maasserver.models import BootSourceSelection
15
 
from maasserver.models.testing import UpdateBootSourceCacheDisconnected
 
15
from maasserver.models.signals import bootsources
16
16
from maasserver.testing.api import APITestCase
17
17
from maasserver.testing.factory import factory
18
18
from maasserver.utils.converters import json_load_bytes
36
36
 
37
37
    def setUp(self):
38
38
        super(TestBootSourceSelectionAPI, self).setUp()
39
 
        self.useFixture(UpdateBootSourceCacheDisconnected())
 
39
        # Disable boot source cache signals.
 
40
        self.addCleanup(bootsources.signals.enable)
 
41
        bootsources.signals.disable()
40
42
 
41
43
    def test_handler_path(self):
42
44
        self.assertEqual(
130
132
 
131
133
    def setUp(self):
132
134
        super(TestBootSourceSelectionsAPI, self).setUp()
133
 
        self.useFixture(UpdateBootSourceCacheDisconnected())
 
135
        # Disable boot source cache signals.
 
136
        self.addCleanup(bootsources.signals.enable)
 
137
        bootsources.signals.disable()
134
138
 
135
139
    def test_handler_path(self):
136
140
        self.assertEqual(