Build from master with 2014.2.b2

[openstack-build/neutron-build.git] / debian / patches / disable-udev-tests.patch

diff --git a/debian/patches/disable-udev-tests.patch b/debian/patches/disable-udev-tests.patch
index 3793c77efa14e962c1f19558f65f582fcfff0389..32bb099cf90c2aae534ee3b0a6876accf7cf1b4f 100644 (file)
--- a/debian/patches/disable-udev-tests.patch
+++ b/debian/patches/disable-udev-tests.patch
@@ -1,14 +1,24 @@
+diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+index c367710..09c3d46 100644
 --- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
 +++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
-@@ -45,6 +45,7 @@ class FakeIpDevice(object):
+@@ -48,6 +48,7 @@ class FakeIpDevice(object):
  class TestLinuxBridge(base.BaseTestCase):
  
      def setUp(self):
 +        self.skipTest("udev not consistently available in Ubuntu buildds")
          super(TestLinuxBridge, self).setUp()
-         self.addCleanup(cfg.CONF.reset)
          interface_mappings = {'physnet1': 'eth1'}
-@@ -160,6 +161,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+         root_helper = cfg.CONF.AGENT.root_helper
+@@ -96,6 +97,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
+         'cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff']
+ 
+     def setUp(self):
++        self.skipTest("udev not consistently available in Ubuntu buildds")
+         super(TestLinuxBridgeAgent, self).setUp()
+         # disable setting up periodic state reporting
+         cfg.CONF.set_override('report_interval', 0, 'AGENT')
+@@ -218,6 +220,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
  
  class TestLinuxBridgeManager(base.BaseTestCase):
      def setUp(self):
@@ -16,11 +26,4 @@
          super(TestLinuxBridgeManager, self).setUp()
          self.interface_mappings = {'physnet1': 'eth1'}
          self.root_helper = cfg.CONF.AGENT.root_helper
-@@ -639,6 +641,7 @@ class TestLinuxBridgeManager(base.BaseTe
- 
- class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
-     def setUp(self):
-+        self.skipTest("udev not  consistently available in Ubuntu buildds")
-         cfg.CONF.set_override('local_ip', LOCAL_IP, 'VXLAN')
-         self.addCleanup(cfg.CONF.reset)
-         super(TestLinuxBridgeRpcCallbacks, self).setUp()
+