diff options
| author | Timofey Durakov <tdurakov@mirantis.com> | 2015-03-05 15:02:10 +0300 |
|---|---|---|
| committer | Jay Pipes <jaypipes@gmail.com> | 2015-04-17 17:02:41 +0000 |
| commit | 56f355ef364b287c5fafb3a91a07ce9adc57f4e0 (patch) | |
| tree | 98ad0729c7a0561cd779352a685a16a13171a8e2 | |
| parent | 0e28a5f6d4c3c343d8ed961a75f5004c8bccdcb2 (diff) | |
| download | nova-56f355ef364b287c5fafb3a91a07ce9adc57f4e0.tar.gz | |
refactored tests to pass in test_inject to pass with random PYTHONHASHSEED
use OrderedDict for metadata to guarantee metadata iteration order
Partial-Bug: #1348818
Change-Id: Ifbe2eb94ac27c778c7a53ec95324c429053a9003
| -rw-r--r-- | nova/tests/unit/virt/disk/test_inject.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nova/tests/unit/virt/disk/test_inject.py b/nova/tests/unit/virt/disk/test_inject.py index 8badd6071b..29bd8f5f9f 100644 --- a/nova/tests/unit/virt/disk/test_inject.py +++ b/nova/tests/unit/virt/disk/test_inject.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from collections import OrderedDict import os import fixtures @@ -147,12 +148,13 @@ class VirtDiskTest(test.NoDBTestCase): def test_inject_metadata(self): vfs = vfsguestfs.VFSGuestFS("/some/file", "qcow2") vfs.setup() - - diskapi._inject_metadata_into_fs({"foo": "bar", "eek": "wizz"}, vfs) + metadata = {"foo": "bar", "eek": "wizz"} + metadata = OrderedDict(sorted(metadata.items())) + diskapi._inject_metadata_into_fs(metadata, vfs) self.assertIn("/meta.js", vfs.handle.files) - self.assertEqual({'content': '{"foo": "bar", ' + - '"eek": "wizz"}', + self.assertEqual({'content': '{"eek": "wizz", ' + + '"foo": "bar"}', 'gid': 100, 'isdir': False, 'mode': 0o700, |