X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fpatches%2Fskip-iptest.patch;fp=trusty%2Fdebian%2Fpatches%2Fskip-iptest.patch;h=0000000000000000000000000000000000000000;hb=33f494780fed13daabda23be6ceef83210e1d403;hp=6645e7e0313b7a7ffade76f960244b304a2cf2df;hpb=54c2ba6a6661f3214775d91c5755c37c685574a4;p=openstack-build%2Fneutron-build.git

diff --git a/trusty/debian/patches/skip-iptest.patch b/trusty/debian/patches/skip-iptest.patch
deleted file mode 100644
index 6645e7e03..000000000
--- a/trusty/debian/patches/skip-iptest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuarp neutron-2015.1.0rc1.orig/neutron/tests/unit/agent/linux/test_ipset_manager.py neutron-2015.1.0rc1/neutron/tests/unit/agent/linux/test_ipset_manager.py
---- neutron-2015.1.0rc1.orig/neutron/tests/unit/agent/linux/test_ipset_manager.py	2015-04-09 14:53:03.000000000 -0400
-+++ neutron-2015.1.0rc1/neutron/tests/unit/agent/linux/test_ipset_manager.py	2015-04-11 15:51:19.917333947 -0400
-@@ -129,6 +129,7 @@ class IpsetManagerTestCase(BaseIpsetMana
-         self.verify_mock_calls()
- 
-     def test_set_members_adding_more_than_5(self):
-+        self.skipTest('Skipped in Ubuntu buildds')
-         self.add_first_ip()
-         self.expect_set(FAKE_IPS)
-         self.ipset.set_members(TEST_SET_ID, ETHERTYPE, FAKE_IPS)