← Back to branch summary

~ubuntu-branches/ubuntu/vivid/neutron/vivid-updates

« back to all changes in this revision

Viewing changes to neutron/tests/unit/agent/test_l3_event_observers.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-03-30 11:17:19 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150330111719-h0gx7233p4jkkgfh
Tags: 1:2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1263539
* New upstream milestone release:
  - d/control: Align version requirements with upstream.
  - d/control: Add new dependency on oslo-log.
  - d/p/*: Rebase.
  - d/control,d/neutron-plugin-hyperv*: Dropped, decomposed into
    separate project upstream.
  - d/control,d/neutron-plugin-openflow*: Dropped, decomposed into
    separate project upstream.
  - d/neutron-common.install: Add neutron-rootwrap-daemon and 
    neutron-keepalived-state-change binaries.
  - d/rules: Ignore neutron-hyperv-agent when installing; only for Windows.
  - d/neutron-plugin-cisco.install: Drop neutron-cisco-cfg-agent as
    decomposed into separate project upstream.
  - d/neutron-plugin-vmware.install: Drop neutron-check-nsx-config and
    neutron-nsx-manage as decomposed into separate project upstream.
  - d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent.
* d/pydist-overrides: Add overrides for oslo packages.
* d/control: Fixup type in package description (LP: #1263539).
* d/p/fixup-driver-test-execution.patch: Cherry pick fix from upstream VCS
  to support unit test exection in out-of-tree vendor drivers.
* d/neutron-common.postinst: Allow general access to /etc/neutron but limit
  access to root/neutron to /etc/neutron/neutron.conf to support execution
  of unit tests in decomposed vendor drivers.
* d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent
  package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/tests/unit/agent/test_l3_event_observers.py
14
14
#    under the License.
15
15
 
16
16
import mock
 
17
import testtools
17
18
 
18
19
from neutron.agent.l3 import event_observers
19
20
from neutron.services import advanced_service as adv_svc
45
46
        self.event_observers.add(observer)
46
47
        self.assertIn(observer, self.event_observers.observers)
47
48
 
48
 
    def test_add_duplicate_observer_is_ignored(self):
49
 
        observer = object()
 
49
    def test_add_duplicate_observer_type_raises(self):
 
50
        agent = mock.Mock()
 
51
        observer = DummyService1(agent)
50
52
        self.event_observers.add(observer)
51
 
        try:
52
 
            self.event_observers.add(observer)
53
 
        except Exception:
54
 
            self.fail('Duplicate additions of observers should be ignored')
 
53
 
 
54
        observer2 = DummyService1(agent)
 
55
        with testtools.ExpectedException(ValueError):
 
56
            self.event_observers.add(observer2)
 
57
 
55
58
        self.assertEqual(1, len(self.event_observers.observers))
56
59
 
57
60
    def test_observers_in_service_notified(self):
58
61
        """Test that correct handlers for multiple services are called."""
59
62
        l3_agent = mock.Mock()
60
63
        router_info = mock.Mock()
61
 
        observer1 = DummyService1.instance(l3_agent)
62
 
        observer2 = DummyService2.instance(l3_agent)
 
64
        observer1 = DummyService1(l3_agent)
 
65
        observer2 = DummyService2(l3_agent)
63
66
        observer1_before_add = mock.patch.object(
64
67
            DummyService1, 'before_router_added').start()
65
68
        observer2_before_add = mock.patch.object(