X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Fdisable-udev-tests.patch;h=d5b3bc12953cc36ddbadfbd62c8fef8819e3b24a;hb=refs%2Fheads%2Fopenstack-ci%2Ffuel-5.1.1%2F2014.1.1;hp=3793c77efa14e962c1f19558f65f582fcfff0389;hpb=5f1c6af61342a3d3baabaf2bab5c3cc32f3f1ca6;p=openstack-build%2Fneutron-build.git

diff --git a/debian/patches/disable-udev-tests.patch b/debian/patches/disable-udev-tests.patch
index 3793c77ef..d5b3bc129 100644
--- a/debian/patches/disable-udev-tests.patch
+++ b/debian/patches/disable-udev-tests.patch
@@ -1,14 +1,27 @@
+Description: Disable udev tests
+ udev is not always avaliable in Ubuntu buildds; skip tests that
+ want to use this feature.
+Author: Chuck Short <zulcss@ubuntu.com>
+Fowarded: not-needed
 --- 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):
+@@ -47,6 +47,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
+@@ -95,6 +96,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+         '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')
+@@ -163,6 +165,7 @@ class TestLinuxBridgeAgent(base.BaseTest
  
  class TestLinuxBridgeManager(base.BaseTestCase):
      def setUp(self):
@@ -16,11 +29,3 @@
          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()