Produce expected output during tests

pkg_req.extras and pkg_req.specs are stored in Sets and thus ordering can't be predicted.
madpah · Jul 7, 2017 · 44812d9 · 44812d9
1 parent 659c4af
commit 44812d9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 31 deletions.
diff --git a/tests/reqfiles/extras_1.expected b/tests/reqfiles/extras_1.expected
@@ -28,8 +28,8 @@
   "editable": false,
   "uri": null,
   "extras": [
-   "foo",
-   "bar"
+   "bar",
+   "foo"
   ],
   "vcs": null,
   "path": null,

diff --git a/tests/reqfiles/illustrative_requirements.expected b/tests/reqfiles/illustrative_requirements.expected
@@ -27,13 +27,13 @@
   "hash_name": null,
   "hash": null,
   "specs": [
-   [
-    ">=",
-    "1.5"
-   ],
    [
     "<",
     "1.6"
+   ],
+   [
+    ">=",
+    "1.5"
    ]
   ],
   "revision": null

diff --git a/tests/reqfiles/specs_1.expected b/tests/reqfiles/specs_1.expected
@@ -12,26 +12,11 @@
   "hash_name": null,
   "hash": null,
   "specs": [
-   [
-    "<",
-    "1.6"
-   ],
-   [
-    ">",
-    "1.9"
-   ],
-   [
-    "!=",
-    "1.9.6"
-   ],
-   [
-    "<",
-    "2.0a0"
-   ],
-   [
-    "==",
-    "2.4c1"
-   ]
+   ["!=", "1.9.6"],
+   ["<", "1.6"],
+   ["<", "2.0a0"],
+   ["==", "2.4c1"],
+   [">", "1.9"]
   ],
   "revision": null
  }

diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -12,10 +12,14 @@ def listify(iterable):
     out = []
     for item in iterable:
         if isinstance(item, dict):
-            for key in item:
-                if isinstance(item[key], tuple) or isinstance(item[key], list):
-                    item[key] = listify(item[key])
-        elif isinstance(item, tuple) or isinstance(item, list):
+            for key, value in item.items():
+                if isinstance(item[key], (tuple, list)):
+                    if key in ('extras', 'specs'):
+                        # enforce predictability
+                        item[key] = sorted(listify(value))
+                    else:
+                        item[key] = listify(value)
+        elif isinstance(item, (tuple, list)):
             item = listify(item)
         out.append(item)
     return out
@@ -38,7 +42,7 @@ def check_fail(s):
         def check(s, expected):
             with warnings.catch_warnings():
                 warnings.simplefilter("ignore")
-                assert_equal(listify([dict(r) for r in parse(s)]), expected)
+                assert_equal(listify(dict(r) for r in parse(s)), expected)
 
         fp = os.path.join(REQFILE_DIR, fn)