X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Fdisable-udev-tests.patch;h=3793c77efa14e962c1f19558f65f582fcfff0389;hb=refs%2Fheads%2Fopenstack-ci%2Fbuild%2Fhavana;hp=1601ab9a0cb599e04c67207e46b666916b4d92ff;hpb=41c661dde15aa2524a423ced2815671886af8f36;p=openstack-build%2Fneutron-build.git

diff --git a/debian/patches/disable-udev-tests.patch b/debian/patches/disable-udev-tests.patch
index 1601ab9a0..3793c77ef 100644
--- a/debian/patches/disable-udev-tests.patch
+++ b/debian/patches/disable-udev-tests.patch
@@ -1,13 +1,6 @@
-Description: Disable tests that can fail on buildds
- udev is not universally available on Ubuntu buildds; specifically
- tests that user linux bridge are skipped for this reason.
-Author: James Page <james.page@ubuntu.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
 +++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
-@@ -32,6 +32,7 @@ from neutron.tests import base
+@@ -45,6 +45,7 @@ class FakeIpDevice(object):
  class TestLinuxBridge(base.BaseTestCase):
  
      def setUp(self):
@@ -15,7 +8,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          super(TestLinuxBridge, self).setUp()
          self.addCleanup(cfg.CONF.reset)
          interface_mappings = {'physnet1': 'eth1'}
-@@ -139,6 +140,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+@@ -160,6 +161,7 @@ class TestLinuxBridgeAgent(base.BaseTest
  
  class TestLinuxBridgeManager(base.BaseTestCase):
      def setUp(self):
@@ -23,11 +16,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          super(TestLinuxBridgeManager, self).setUp()
          self.interface_mappings = {'physnet1': 'eth1'}
          self.root_helper = cfg.CONF.AGENT.root_helper
-@@ -639,6 +639,7 @@ class TestLinuxBridgeManager(base.BaseTestCase):
-
+@@ -639,6 +641,7 @@ class TestLinuxBridgeManager(base.BaseTe
+ 
  class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
      def setUp(self):
-+        self.skipTest("udev not consistently available in Ubuntu buildds")
++        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()