diff options
Diffstat (limited to 'bitbake/lib/bb/tests/data.py')
-rw-r--r-- | bitbake/lib/bb/tests/data.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/tests/data.py b/bitbake/lib/bb/tests/data.py index 12232305c3..b54eb06797 100644 --- a/bitbake/lib/bb/tests/data.py +++ b/bitbake/lib/bb/tests/data.py | |||
@@ -147,14 +147,14 @@ class DataExpansions(unittest.TestCase): | |||
147 | self.assertEqual(self.d.getVar("foo", False), None) | 147 | self.assertEqual(self.d.getVar("foo", False), None) |
148 | 148 | ||
149 | def test_keys(self): | 149 | def test_keys(self): |
150 | keys = self.d.keys() | 150 | keys = list(self.d.keys()) |
151 | self.assertEqual(keys, ['value_of_foo', 'foo', 'bar']) | 151 | self.assertCountEqual(keys, ['value_of_foo', 'foo', 'bar']) |
152 | 152 | ||
153 | def test_keys_deletion(self): | 153 | def test_keys_deletion(self): |
154 | newd = bb.data.createCopy(self.d) | 154 | newd = bb.data.createCopy(self.d) |
155 | newd.delVar("bar") | 155 | newd.delVar("bar") |
156 | keys = newd.keys() | 156 | keys = list(newd.keys()) |
157 | self.assertEqual(keys, ['value_of_foo', 'foo']) | 157 | self.assertCountEqual(keys, ['value_of_foo', 'foo']) |
158 | 158 | ||
159 | class TestNestedExpansions(unittest.TestCase): | 159 | class TestNestedExpansions(unittest.TestCase): |
160 | def setUp(self): | 160 | def setUp(self): |
@@ -334,7 +334,7 @@ class TestOverrides(unittest.TestCase): | |||
334 | self.d.setVar("TEST2_bar", "testvalue2") | 334 | self.d.setVar("TEST2_bar", "testvalue2") |
335 | bb.data.update_data(self.d) | 335 | bb.data.update_data(self.d) |
336 | self.assertEqual(self.d.getVar("TEST2", True), "testvalue2") | 336 | self.assertEqual(self.d.getVar("TEST2", True), "testvalue2") |
337 | self.assertItemsEqual(self.d.keys(), ['TEST', 'TEST2', 'OVERRIDES', 'TEST2_bar']) | 337 | self.assertCountEqual(list(self.d.keys()), ['TEST', 'TEST2', 'OVERRIDES', 'TEST2_bar']) |
338 | 338 | ||
339 | def test_multiple_override(self): | 339 | def test_multiple_override(self): |
340 | self.d.setVar("TEST_bar", "testvalue2") | 340 | self.d.setVar("TEST_bar", "testvalue2") |
@@ -342,7 +342,7 @@ class TestOverrides(unittest.TestCase): | |||
342 | self.d.setVar("TEST_foo", "testvalue4") | 342 | self.d.setVar("TEST_foo", "testvalue4") |
343 | bb.data.update_data(self.d) | 343 | bb.data.update_data(self.d) |
344 | self.assertEqual(self.d.getVar("TEST", True), "testvalue3") | 344 | self.assertEqual(self.d.getVar("TEST", True), "testvalue3") |
345 | self.assertItemsEqual(self.d.keys(), ['TEST', 'TEST_foo', 'OVERRIDES', 'TEST_bar', 'TEST_local']) | 345 | self.assertCountEqual(list(self.d.keys()), ['TEST', 'TEST_foo', 'OVERRIDES', 'TEST_bar', 'TEST_local']) |
346 | 346 | ||
347 | def test_multiple_combined_overrides(self): | 347 | def test_multiple_combined_overrides(self): |
348 | self.d.setVar("TEST_local_foo_bar", "testvalue3") | 348 | self.d.setVar("TEST_local_foo_bar", "testvalue3") |