From 22d3fe2832cf758b1efa75d2fdecf6e061fbdb0d Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Mon, 17 Feb 2014 15:01:24 +0000
Subject: morphloader: Dump dicts with a nicer key order

---
 morphlib/morphloader_tests.py | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

(limited to 'morphlib/morphloader_tests.py')

diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py
index b8738804..a050e10b 100644
--- a/morphlib/morphloader_tests.py
+++ b/morphlib/morphloader_tests.py
@@ -505,9 +505,9 @@ build-system: dummy
         # The following verifies that the YAML is written in a normalised
         # fashion.
         self.assertEqual(text, '''\
-build-system: dummy
-kind: chunk
 name: foo
+kind: chunk
+build-system: dummy
 ''')
 
     def test_saves_to_file(self):
@@ -524,9 +524,9 @@ name: foo
         # The following verifies that the YAML is written in a normalised
         # fashion.
         self.assertEqual(text, '''\
-build-system: dummy
-kind: chunk
 name: foo
+kind: chunk
+build-system: dummy
 ''')
 
     def test_validate_does_not_set_defaults(self):
@@ -862,3 +862,35 @@ name: foo
                 self.assertEqual(warning.morphology_name, 'foo')
                 self.assertEqual(warning.stratum_name, 'bar')
                 self.assertEqual(warning.field, obsolete_field)
+
+    def test_unordered_asciibetically_after_ordered(self):
+        # We only get morphologies with arbitrary keys in clusters
+        m = morphlib.morph3.Morphology(
+            name='foo',
+            kind='cluster',
+            systems=[
+                {
+                    'morph': 'system-name',
+                    'repo': 'test:morphs',
+                    'ref': 'master',
+                    'deploy': {
+                        'deployment-foo': {
+                            'type': 'tarball',
+                            'location': '/tmp/path.tar',
+                            'HOSTNAME': 'aasdf',
+                        }
+                    }
+                }
+            ]
+        )
+        s = self.loader.save_to_string(m)
+        # root field order
+        self.assertLess(s.find('name'), s.find('kind'))
+        self.assertLess(s.find('kind'), s.find('systems'))
+        # systems field order
+        self.assertLess(s.find('morph'), s.find('repo'))
+        self.assertLess(s.find('repo'), s.find('ref'))
+        self.assertLess(s.find('ref'), s.find('deploy'))
+        # deployment keys field order
+        self.assertLess(s.find('type'), s.find('location'))
+        self.assertLess(s.find('location'), s.find('HOSTNAME'))
-- 
cgit v1.2.1