← Back to branch summary

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

« back to all changes in this revision

Viewing changes to neutron/tests/unit/test_basetestcase.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/test_basetestcase.py
20
20
from neutron.tests import base
21
21
 
22
22
 
23
 
class SytemExitTestCase(base.BaseTestCase):
 
23
class SystemExitTestCase(base.BaseTestCase):
24
24
 
25
25
    def setUp(self):
26
26
        def _fail_SystemExit(exc_info):
27
27
            if isinstance(exc_info[1], SystemExit):
28
28
                self.fail("A SystemExit was allowed out")
29
 
        super(SytemExitTestCase, self).setUp()
 
29
        super(SystemExitTestCase, self).setUp()
30
30
        # add the handler last so reaching it means the handler in BaseTestCase
31
31
        # didn't do it's job
32
32
        self.addOnException(_fail_SystemExit)
33
33
 
34
34
    def run(self, *args, **kwargs):
35
35
        exc = self.assertRaises(AssertionError,
36
 
                                super(SytemExitTestCase, self).run,
 
36
                                super(SystemExitTestCase, self).run,
37
37
                                *args, **kwargs)
38
38
        # this message should be generated when SystemExit is raised by a test
39
39
        self.assertIn('A SystemExit was raised during the test.', str(exc))