Update DEB-specs to 2013.2 version
[openstack-build/neutron-build.git] / debian / patches / disable-ml2-notification-tests.patch
index d042302cc32704e8bdfbf7fe41b2e5e9ec4ec3c7..8441d092f939995de6bbca360cc8c5886996d026 100644 (file)
@@ -1,29 +1,24 @@
-Description: Disable failing ml2 plugin tests.
-Author: James Page <james.page@ubuntu.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1204456
-Forwared: not-needed
-
 --- a/neutron/tests/unit/ml2/test_agent_scheduler.py
 +++ b/neutron/tests/unit/ml2/test_agent_scheduler.py
-@@ -19,18 +19,12 @@ from neutron.tests.unit.openvswitch import test_agent_scheduler
-
+@@ -19,18 +19,19 @@ from neutron.tests.unit.openvswitch impo
  class Ml2AgentSchedulerTestCase(
      test_agent_scheduler.OvsAgentSchedulerTestCase):
 -    plugin_str = test_ml2_plugin.PLUGIN_NAME
--    l3_plugin = ('neutron.services.l3_router.'
--                 'l3_router_plugin.L3RouterPlugin')
--
 +    pass
-
+     l3_plugin = ('neutron.services.l3_router.'
+                  'l3_router_plugin.L3RouterPlugin')
  class Ml2L3AgentNotifierTestCase(
      test_agent_scheduler.OvsL3AgentNotifierTestCase):
 -    plugin_str = test_ml2_plugin.PLUGIN_NAME
--    l3_plugin = ('neutron.services.l3_router.'
--                 'l3_router_plugin.L3RouterPlugin')
--
 +    pass
-
+     l3_plugin = ('neutron.services.l3_router.'
+                  'l3_router_plugin.L3RouterPlugin')
  class Ml2DhcpAgentNotifierTestCase(
      test_agent_scheduler.OvsDhcpAgentNotifierTestCase):
--    plugin_str = test_ml2_plugin.PLUGIN_NAME
 +    pass
+     plugin_str = test_ml2_plugin.PLUGIN_NAME