[Patchew-devel] [PATCH 1/2] tests: Don't assume result order in rest test

Fam Zheng posted 2 patches 9 months, 2 weeks ago
[Patchew-devel] [PATCH 1/2] tests: Don't assume result order in rest test
Posted by Fam Zheng 9 months, 2 weeks ago
Signed-off-by: Fam Zheng <fam.zheng@bytedance.com>
---
 tests/test_rest.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/test_rest.py b/tests/test_rest.py
index cceda69..ccaeca4 100755
--- a/tests/test_rest.py
+++ b/tests/test_rest.py
@@ -411,18 +411,18 @@ class RestTest(PatchewTestCase):
 
         resp = self.api_client.get(self.REST_BASE + "series/?q=project:QEMU")
         self.assertEqual(resp.data["count"], 2)
-        self.assertEqual(
-            resp.data["results"][0]["resource_uri"], resp1.data["resource_uri"]
-        )
-        self.assertEqual(resp.data["results"][0]["subject"], resp1.data["subject"])
-        self.assertEqual("replies" in resp.data["results"][0], False)
-        self.assertEqual("patches" in resp.data["results"][0], False)
-        self.assertEqual(
-            resp.data["results"][1]["resource_uri"], resp2.data["resource_uri"]
-        )
-        self.assertEqual(resp.data["results"][1]["subject"], resp2.data["subject"])
-        self.assertEqual("replies" in resp.data["results"][1], False)
-        self.assertEqual("patches" in resp.data["results"][1], False)
+
+        def cmp_result(a, expected):
+            self.assertEqual(a["resource_uri"], expected["resource_uri"])
+            self.assertEqual(a["subject"], expected["subject"])
+            self.assertNotIn("replies", a)
+            self.assertNotIn("patches", a)
+        if resp.data["results"][0]["subject"] == resp1.data["subject"]:
+            cmp_result(resp.data['results'][0], resp1.data)
+            cmp_result(resp.data['results'][1], resp2.data)
+        else:
+            cmp_result(resp.data['results'][0], resp2.data)
+            cmp_result(resp.data['results'][1], resp1.data)
 
         resp = self.api_client.get(self.REST_BASE + "projects/12345/series/?q=quorum")
         self.assertEqual(resp.status_code, 404)
-- 
2.25.1

_______________________________________________
Patchew-devel mailing list
Patchew-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/patchew-devel