diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-14 17:45:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-14 17:45:45 +0000 |
| commit | bf9e6cea186272dda17ad8b874933b2241ee8f97 (patch) | |
| tree | abbaf9176e7e075b7458302918be5f236c7b59ff | |
| parent | ecca6c30b6e3a1ccc33c4c0c93c2ef4a87081de0 (diff) | |
| parent | e48431192375bbace0adc896b9c4de3a9cd00b34 (diff) | |
| download | python-glanceclient-bf9e6cea186272dda17ad8b874933b2241ee8f97.tar.gz | |
Merge "update shell tests to not rely on the serialization order of a dict"
| -rw-r--r-- | glanceclient/tests/unit/test_shell.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/glanceclient/tests/unit/test_shell.py b/glanceclient/tests/unit/test_shell.py index ce2fec3..0f15007 100644 --- a/glanceclient/tests/unit/test_shell.py +++ b/glanceclient/tests/unit/test_shell.py @@ -799,10 +799,10 @@ class ShellCacheSchemaTest(testutils.TestCase): open.mock_calls[0]) self.assertEqual(mock.call(self.cache_files[1], 'w'), open.mock_calls[4]) - self.assertEqual(mock.call().write(json.dumps(schema_odict)), - open.mock_calls[2]) - self.assertEqual(mock.call().write(json.dumps(schema_odict)), - open.mock_calls[6]) + actual = json.loads(open.mock_calls[2][1][0]) + self.assertEqual(schema_odict, actual) + actual = json.loads(open.mock_calls[6][1][0]) + self.assertEqual(schema_odict, actual) @mock.patch('six.moves.builtins.open', new=mock.mock_open(), create=True) @mock.patch('os.path.exists', side_effect=[True, False, False, False]) @@ -822,10 +822,10 @@ class ShellCacheSchemaTest(testutils.TestCase): open.mock_calls[0]) self.assertEqual(mock.call(self.cache_files[1], 'w'), open.mock_calls[4]) - self.assertEqual(mock.call().write(json.dumps(schema_odict)), - open.mock_calls[2]) - self.assertEqual(mock.call().write(json.dumps(schema_odict)), - open.mock_calls[6]) + actual = json.loads(open.mock_calls[2][1][0]) + self.assertEqual(schema_odict, actual) + actual = json.loads(open.mock_calls[6][1][0]) + self.assertEqual(schema_odict, actual) @mock.patch('six.moves.builtins.open', new=mock.mock_open(), create=True) @mock.patch('os.path.exists', return_value=True) |