← Back to branch summary

~corey.bryant/neutron/2014.1.4

« back to all changes in this revision

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

  • Committer: James Page
  • Date: 2014-04-01 15:23:04 UTC
  • Revision ID: james.page@canonical.com-20140401152304-fso32a4asqt3pk2j
Tags: 1:2014.1~rc1-0ubuntu1
releasing package neutron version 1:2014.1~rc1-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/disable-udev-tests.patch
3
3
 want to use this feature.
4
4
Author: Chuck Short <zulcss@ubuntu.com>
5
5
Fowarded: not-needed
6
 
diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
7
 
index f4c5d41..d18a768 100644
8
6
--- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
9
7
+++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
10
8
@@ -47,6 +47,7 @@ class FakeIpDevice(object):
15
13
         super(TestLinuxBridge, self).setUp()
16
14
         interface_mappings = {'physnet1': 'eth1'}
17
15
         root_helper = cfg.CONF.AGENT.root_helper
18
 
@@ -95,6 +96,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
 
16
@@ -95,6 +96,7 @@ class TestLinuxBridgeAgent(base.BaseTest
19
17
         'cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff']
20
18
 
21
19
     def setUp(self):
23
21
         super(TestLinuxBridgeAgent, self).setUp()
24
22
         # disable setting up periodic state reporting
25
23
         cfg.CONF.set_override('report_interval', 0, 'AGENT')
26
 
@@ -163,6 +165,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
 
24
@@ -163,6 +165,7 @@ class TestLinuxBridgeAgent(base.BaseTest
27
25
 
28
26
 class TestLinuxBridgeManager(base.BaseTestCase):
29
27
     def setUp(self):