← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/maasserver/rpc/tests/test_regionservice_calls.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/rpc/tests/test_regionservice_calls.py
35
35
    Node,
36
36
)
37
37
from maasserver.models.interface import PhysicalInterface
 
38
from maasserver.models.signals import bootsources
38
39
from maasserver.models.signals.testing import SignalsDisabled
39
40
from maasserver.rpc import (
40
41
    events as events_module,
442
443
    @wait_for_reactor
443
444
    @inlineCallbacks
444
445
    def test_get_proxies_with_http_proxy_not_set(self):
 
446
        # Disable boot source cache signals.
 
447
        self.addCleanup(bootsources.signals.enable)
 
448
        bootsources.signals.disable()
 
449
 
445
450
        yield deferToDatabase(self.set_http_proxy, None)
446
451
 
447
452
        response = yield call_responder(Region(), GetProxies, {})
453
458
    @wait_for_reactor
454
459
    @inlineCallbacks
455
460
    def test_get_proxies_with_http_proxy_set(self):
 
461
        # Disable boot source cache signals.
 
462
        self.addCleanup(bootsources.signals.enable)
 
463
        bootsources.signals.disable()
 
464
 
456
465
        url = factory.make_parsed_url()
457
466
        yield deferToDatabase(self.set_http_proxy, url.geturl())
458
467