Make test_merge_when_array_is_mixed_without_schema narrower

open-contracting · Nov 27, 2018 · 2594fa7 · 2594fa7
1 parent 937d628
commit 2594fa7
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/tests/test_merge.py b/tests/test_merge.py
@@ -191,16 +191,19 @@ def test_merge_when_array_is_mixed_without_schema():
 
     assert merge(data, {}) == output
 
-    with pytest.raises(AssertionError):
-        for i in range(2):
-            for j in range(2):
-                actual = deepcopy(data)
-                expected = deepcopy(output)
-                del actual[i]['mixedArray'][j]
-                if i == 1:
-                    del expected['mixedArray'][j]
+    for i in range(2):
+        for j in range(2):
+            actual = deepcopy(data)
+            expected = deepcopy(output)
+            del actual[i]['mixedArray'][j]
+            if i == 1:
+                del expected['mixedArray'][j]
 
+            if j == 0:
                 assert merge(actual, {}) == expected, 'removed item index {} from release index {}'.format(j, i)
+            else:
+                with pytest.raises((AttributeError, AssertionError)):
+                    assert merge(actual, {}) == expected, 'removed item index {} from release index {}'.format(j, i)
 
 
 def test_get_latest_version():