-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):
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):
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()