fix: Adjust the integration tests (#85)

ZPascal · May 30, 2024 · afeb960 · afeb960
1 parent bfc5b3e
commit afeb960
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 268 deletions.
diff --git a/tests/integrationtest/test_alerting.py b/tests/integrationtest/test_alerting.py
@@ -66,6 +66,16 @@ def test_c_delete_alertmanager_config(self):
                     "group_by": ["grafana_folder", "alertname"],
                     "receiver": "grafana-default-email",
                     "provenance": "api",
+                    "routes": [{"object_matchers": [["__grafana_autogenerated__",
+                                                     "=",
+                                                     "true"]],
+                                "receiver": "grafana-default-email",
+                                "routes": [{"group_by": ["grafana_folder",
+                                                         "alertname"],
+                                            "object_matchers": [["__grafana_receiver__",
+                                                                 "=",
+                                                                 "grafana-default-email"]],
+                                            "receiver": "grafana-default-email"}]}]
                 },
                 "templates": None,
                 "receivers": [
@@ -83,8 +93,9 @@ def test_c_delete_alertmanager_config(self):
                         ],
                     }
                 ],
-            },
+            }
         }
+
         self.assertEqual(result, self.alerting.get_alertmanager_config())
 
     def test_test_alertmanager_receivers(self):
@@ -127,8 +138,8 @@ def test_get_prometheus_alerts(self):
 
         for i in range(0, MAX_TRIES):
             if (
-                len(self.alerting.get_prometheus_alerts().get("data").get("alerts"))
-                != 0
+                    len(self.alerting.get_prometheus_alerts().get("data").get("alerts"))
+                    != 0
             ):
                 time.sleep(0.1 + i / 2)
                 self.assertEqual(

diff --git a/tests/integrationtest/test_alerting_notifications.py b/tests/integrationtest/test_alerting_notifications.py
diff --git a/tests/integrationtest/test_folder.py b/tests/integrationtest/test_folder.py
@@ -28,14 +28,14 @@ def test_get_folder_by_uids(self):
                 "canEdit": True,
                 "canSave": True,
                 "created": "2022-01-10T00:24:58+01:00",
-                "createdBy": "[email protected]",
-                "hasAcl": True,
+                "createdBy": "Anonymous",
+                "hasAcl": False,
                 "id": 72,
                 "orgId": 0,
                 "title": "Github Integrationtest",
                 "uid": "6U_QdWJnz",
                 "updated": "2022-01-10T00:24:58+01:00",
-                "updatedBy": "[email protected]",
+                "updatedBy": "Anonymous",
                 "url": "/dashboards/f/6U_QdWJnz/github-integrationtest",
                 "version": 1,
             },
@@ -50,14 +50,14 @@ def test_get_folder_by_id(self):
                 "canEdit": True,
                 "canSave": True,
                 "created": "2022-01-10T00:24:58+01:00",
-                "createdBy": "[email protected]",
-                "hasAcl": True,
+                "createdBy": "Anonymous",
+                "hasAcl": False,
                 "id": 72,
                 "orgId": 0,
                 "title": "Github Integrationtest",
                 "uid": "6U_QdWJnz",
                 "updated": "2022-01-10T00:24:58+01:00",
-                "updatedBy": "[email protected]",
+                "updatedBy": "Anonymous",
                 "url": "/dashboards/f/6U_QdWJnz/github-integrationtest",
                 "version": 1,
             },

diff --git a/tests/integrationtest/test_organisation.py b/tests/integrationtest/test_organisation.py
@@ -26,14 +26,14 @@ def test_get_all_users_by_the_current_organization(self):
             self.organisation.get_all_users_by_the_current_organization()
         )
 
-        self.assertEqual(4, organisation_users[1].get("userId"))
+        self.assertEqual(8, organisation_users[0].get("userId"))
 
     def test_get_all_users_by_the_current_organization_lookup(self):
         organisation_users: list = (
             self.organisation.get_all_users_by_the_current_organization_lookup()
         )
 
-        self.assertEqual(4, organisation_users[1].get("userId"))
+        self.assertEqual(8, organisation_users[0].get("userId"))
 
     def test_a_update_current_organization(self):
         self.organisation.update_current_organization("Test")
@@ -55,19 +55,19 @@ def test_a_add_new_user_to_current_organization(self):
         organisation_users: list = (
             self.organisation.get_all_users_by_the_current_organization_lookup()
         )
-        self.assertEqual("Test", organisation_users[2].get("login"))
+        self.assertEqual("[email protected]", organisation_users[1].get("login"))
 
     def test_b_update_organization_user_role_by_user_id(self):
-        self.organisation.update_organization_user_role_by_user_id(7, "Editor")
+        self.organisation.update_organization_user_role_by_user_id(1967, "Editor")
 
         organisation_users: list = (
             self.organisation.get_all_users_by_the_current_organization()
         )
-        self.assertEqual(7, organisation_users[2].get("userId"))
-        self.assertEqual("Editor", organisation_users[2].get("role"))
+        self.assertEqual(1967, organisation_users[1].get("userId"))
+        self.assertEqual("Editor", organisation_users[1].get("role"))
 
     def test_c_delete_organization_user_by_user_id(self):
-        self.organisation.delete_organization_user_by_user_id(7)
+        self.organisation.delete_organization_user_by_user_id(1967)
 
         organisation_users: list = (
             self.organisation.get_all_users_by_the_current_organization()