]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Improve test_set_members_deleting_less_than_5
authorCedric Brandily <zzelle@gmail.com>
Wed, 27 May 2015 06:53:00 +0000 (08:53 +0200)
committerCedric Brandily <zzelle@gmail.com>
Fri, 29 May 2015 16:29:47 +0000 (16:29 +0000)
In test_set_members_deleting_less_than_5[1], 3 ips are deleted from
ipset but test_set_members_deleting_less_than_5 checked that the
first one was deleted because the call ordering was non-trivial.

The test was successful because
assert_has_calls(expected_calls, any_order=False) allows extra calls
before and after expected_calls.

A parent change[2] forces the call ordering, this allows to check that
the 3 ips are deleted.

[1] neutron.tests.unit.agent.linux.test_ipset_manager
[2] I8408365825ec1e97a83c2181f38ec1f9468df91e

Related-Bug: #1348818

Change-Id: I773e2cd19fdec634b728d0c3a78c1d66392c743f

neutron/tests/unit/agent/linux/test_ipset_manager.py

index 2e447bcd77b53391248b2e7a6c156a2b312dc15c..cedbbceeeafaf7fa66992f6875eb0a13e1a2a8a1 100644 (file)
@@ -127,7 +127,7 @@ class IpsetManagerTestCase(BaseIpsetManagerTest):
 
     def test_set_members_deleting_less_than_5(self):
         self.add_all_ips()
-        self.expect_del(FAKE_IPS[3:4])
+        self.expect_del(FAKE_IPS[3:])
         self.ipset.set_members(TEST_SET_ID, ETHERTYPE, FAKE_IPS[0:3])
         self.verify_mock_calls()