From 196bfece300cf2afdae650cbb248abd9be19524b Mon Sep 17 00:00:00 2001 From: Konstantin Smirnov <46676677+konnectr@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:57:22 +0500 Subject: [PATCH] Fix warning test query (#6335) * replace assertDictContainsSubset -> asserLessEqual * refactor definition set --- tests/handlers/test_queries.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/handlers/test_queries.py b/tests/handlers/test_queries.py index 691858b9a..7fbf51128 100644 --- a/tests/handlers/test_queries.py +++ b/tests/handlers/test_queries.py @@ -231,7 +231,7 @@ class TestQueryListResourceGet(BaseTestCase): rv = self.make_request("get", "/api/queries") assert len(rv.json["results"]) == 3 - assert set([result["id"] for result in rv.json["results"]]) == set([q1.id, q2.id, q3.id]) + assert set([result["id"] for result in rv.json["results"]]) == {q1.id, q2.id, q3.id} def test_filters_with_tags(self): q1 = self.factory.create_query(tags=["test"]) @@ -240,7 +240,7 @@ class TestQueryListResourceGet(BaseTestCase): rv = self.make_request("get", "/api/queries?tags=test") assert len(rv.json["results"]) == 1 - assert set([result["id"] for result in rv.json["results"]]) == set([q1.id]) + assert set([result["id"] for result in rv.json["results"]]) == {q1.id} def test_search_term(self): q1 = self.factory.create_query(name="Sales") @@ -249,7 +249,7 @@ class TestQueryListResourceGet(BaseTestCase): rv = self.make_request("get", "/api/queries?q=sales") assert len(rv.json["results"]) == 2 - assert set([result["id"] for result in rv.json["results"]]) == set([q1.id, q2.id]) + assert set([result["id"] for result in rv.json["results"]]) == {q1.id, q2.id} class TestQueryListResourcePost(BaseTestCase): @@ -264,7 +264,7 @@ class TestQueryListResourcePost(BaseTestCase): rv = self.make_request("post", "/api/queries", data=query_data) self.assertEqual(rv.status_code, 200) - self.assertDictContainsSubset(query_data, rv.json) + self.assertLessEqual(query_data.items(), rv.json.items()) self.assertEqual(rv.json["user"]["id"], self.factory.user.id) self.assertIsNotNone(rv.json["api_key"]) self.assertIsNotNone(rv.json["query_hash"]) @@ -335,7 +335,7 @@ class TestQueryArchiveResourceGet(BaseTestCase): rv = self.make_request("get", "/api/queries/archive") assert len(rv.json["results"]) == 2 - assert set([result["id"] for result in rv.json["results"]]) == set([q1.id, q2.id]) + assert set([result["id"] for result in rv.json["results"]]) == {q1.id, q2.id} def test_search_term(self): q1 = self.factory.create_query(name="Sales", is_archived=True) @@ -344,7 +344,7 @@ class TestQueryArchiveResourceGet(BaseTestCase): rv = self.make_request("get", "/api/queries/archive?q=sales") assert len(rv.json["results"]) == 2 - assert set([result["id"] for result in rv.json["results"]]) == set([q1.id, q2.id]) + assert set([result["id"] for result in rv.json["results"]]) == {q1.id, q2.id} class QueryRefreshTest(BaseTestCase):