]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Do not assume order of network_uuid's
authorPritesh Kothari <pritesh.kothari@cisco.com>
Mon, 4 Aug 2014 20:37:56 +0000 (13:37 -0700)
committerpritesh <pritesh.kothari@cisco.com>
Mon, 4 Aug 2014 21:13:50 +0000 (21:13 +0000)
This fixes the neutron.tests.unit.test_linux_dhcp.TestDnsmasq
.test_existing_dhcp_networks unit test that breaks with a
randomized PYTHONHASHSEED (see the bug report).

The test assumed that the network_uuid's list was sorted, so sort
the result before comparing.

Note: There are several other unrelated unit tests that also break with a
randomized PYTHONHASHSEED, but they are not addressed here. They will be
addressed in separate patches.

Partial-bug: #1348818
Change-Id: Ia6f742e1fae0687164b841beebb4efcf31ff2625

neutron/tests/unit/test_linux_dhcp.py

index 98f06decfc7c06100590854fdc5a2fd9c08a5771..2f83e01fb1489b6cbda06203098e69226cf7e658 100644 (file)
@@ -1316,7 +1316,7 @@ tag:tag0,option:router""".lstrip()
                 mock_listdir.assert_called_once_with(path)
                 self.assertEqual(['aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa',
                                   'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb'],
-                                 result)
+                                 sorted(result))
 
     def _check_version(self, cmd_out, expected_value):
         with mock.patch('neutron.agent.linux.utils.execute') as cmd: