Merge pull request #9 from ZPascal/fix-integrationtest

Fix integrationtest

Author: ZPascal

.github/workflows/integrationtest.yml

@@ -23,4 +23,6 @@ jobs:
           GRAFANA_HOST: ${{ secrets.GRAFANA_HOST }}
           GRAFANA_TOKEN: ${{ secrets.GRAFANA_TOKEN }}
           GRAFANA_DASHBOARD_PATH: ${{ secrets.GRAFANA_DASHBOARD_PATH }}
-          GRAFANA_DASHBOARD_NAME: ${{ secrets.GRAFANA_DASHBOARD_NAME }}
+          GRAFANA_DASHBOARD_NAME: ${{ secrets.GRAFANA_DASHBOARD_NAME }}
+          GRAFANA_USERNAME: ${{ secrets.GRAFANA_USERNAME }}
+          GRAFANA_PASSWORD: ${{ secrets.GRAFANA_PASSWORD }}

tests/integrationtest/test_alerting.py

@@ -119,14 +119,10 @@ def test_get_prometheus_alerts(self):
             "data": {
                 "alerts": [
                     {
-                        "labels": {
-                            "__alert_rule_namespace_uid__": "6U_QdWJnz",
-                            "__alert_rule_uid__": "Z9GoLXx7z",
-                            "alertname": "Test",
-                        },
+                        "labels": {'alertname': 'Test'},
                         "annotations": {},
                         "state": "Normal",
-                        "activeAt": "0001-01-01T00:53:28+00:53",
+                        "activeAt": "0001-01-01T00:00:00Z",
                         "value": "",
                     }
                 ]

tests/integrationtest/test_organisation.py

@@ -24,14 +24,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[0].get("userId"))
+        self.assertEqual(4, organisation_users[1].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[0].get("userId"))
+        self.assertEqual(4, organisation_users[1].get("userId"))
 
     def test_a_update_current_organization(self):
         self.organisation.update_current_organization("Test")
@@ -53,21 +53,21 @@ 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[0].get("login"))
+        self.assertEqual("Test", 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")
 
         organisation_users: list = (
             self.organisation.get_all_users_by_the_current_organization()
         )
-        self.assertEqual(7, organisation_users[0].get("userId"))
-        self.assertEqual("Editor", organisation_users[0].get("role"))
+        self.assertEqual(7, 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)
 
         organisation_users: list = (
             self.organisation.get_all_users_by_the_current_organization()
         )
-        self.assertEqual(2, len(organisation_users))
+        self.assertEqual(3, len(organisation_users))

tests/integrationtest/test_snapshot.py

@@ -1,5 +1,4 @@
 import os
-import json
 from unittest import TestCase
 
 from src.grafana_api.model import APIModel