← Back to branch summary

~ubuntu-branches/ubuntu/utopic/neutron/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/disable-udev-tests.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-09-18 13:55:35 UTC
  • Revision ID: package-import@ubuntu.com-20140918135535-gamyfpy0qy0pdkf6
Tags: 1:2014.2~b3-0ubuntu3
* d/control: Align versioned dependencies to b3 release, wrap-and-sort. 
* d/rules: Re-enable test suite.
* d/rules: Enable auto-configuration of test concurrency.
* d/p/*: Refresh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/disable-udev-tests.patch
10
10
 neutron/tests/unit/test_db_plugin.py                    | 2 ++
11
11
 3 files changed, 6 insertions(+)
12
12
 
13
 
diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
14
 
index adc3822..97c95e1 100644
15
13
--- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
16
14
+++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
17
15
@@ -44,6 +44,7 @@ class FakeIpDevice(object):
22
20
         super(TestLinuxBridge, self).setUp()
23
21
         interface_mappings = {'physnet1': 'eth1'}
24
22
         root_helper = cfg.CONF.AGENT.root_helper
25
 
@@ -92,6 +93,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
 
23
@@ -92,6 +93,7 @@ class TestLinuxBridgeAgent(base.BaseTest
26
24
         'cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff']
27
25
 
28
26
     def setUp(self):
30
28
         super(TestLinuxBridgeAgent, self).setUp()
31
29
         # disable setting up periodic state reporting
32
30
         cfg.CONF.set_override('report_interval', 0, 'AGENT')
33
 
@@ -343,6 +345,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
 
31
@@ -343,6 +345,7 @@ class TestLinuxBridgeAgent(base.BaseTest
34
32
 
35
33
 class TestLinuxBridgeManager(base.BaseTestCase):
36
34
     def setUp(self):
38
36
         super(TestLinuxBridgeManager, self).setUp()
39
37
         self.interface_mappings = {'physnet1': 'eth1'}
40
38
         self.root_helper = cfg.CONF.AGENT.root_helper
41
 
diff --git a/neutron/tests/unit/test_agent_linux_utils.py b/neutron/tests/unit/test_agent_linux_utils.py
42
 
index d54d9f1..e7d01f9 100644
43
39
--- a/neutron/tests/unit/test_agent_linux_utils.py
44
40
+++ b/neutron/tests/unit/test_agent_linux_utils.py
45
41
@@ -35,6 +35,7 @@ class FakeCreateProcess(object):
50
46
         super(AgentUtilsExecuteTest, self).setUp()
51
47
         self.root_helper = "echo"
52
48
         self.test_file = self.useFixture(
53
 
diff --git a/neutron/tests/unit/test_db_plugin.py b/neutron/tests/unit/test_db_plugin.py
54
 
index 720d109..0c061d0 100644
55
49
--- a/neutron/tests/unit/test_db_plugin.py
56
50
+++ b/neutron/tests/unit/test_db_plugin.py
57
 
@@ -936,6 +936,7 @@ class TestPortsV2(NeutronDbPluginV2TestCase):
 
51
@@ -936,6 +936,7 @@ class TestPortsV2(NeutronDbPluginV2TestC
58
52
             self._test_list_resources('port', ports)
59
53
 
60
54
     def test_list_ports_filtered_by_fixed_ip(self):
62
56
         # for this test we need to enable overlapping ips
63
57
         cfg.CONF.set_default('allow_overlapping_ips', True)
64
58
         with contextlib.nested(self.port(), self.port()) as (port1, port2):
65
 
@@ -1955,6 +1956,7 @@ class TestNetworksV2(NeutronDbPluginV2TestCase):
 
59
@@ -1955,6 +1956,7 @@ class TestNetworksV2(NeutronDbPluginV2Te
66
60
         self.assertEqual(res.status_int, webob.exc.HTTPCreated.code)
67
61
 
68
62
     def test_create_networks_bulk_tenants_and_quotas_fail(self):
70
64
         if self._skip_native_bulk:
71
65
             self.skipTest("Plugin does not support native bulk network create")
72
66
         quota = 2
73
 
1.9.1
74