fix: Update the integratationtest functionality (#22)

Author: ZPascal

.github/workflows/integrationtest.yml

@@ -1,6 +1,8 @@
 name: Integrationtest
 
 on:
+  schedule:
+    - cron: '0 23 * * 6'
   push:
     branches: [ main ]
   pull_request:

grafana_api/other_http.py

@@ -49,14 +49,9 @@ def renew_login_session_based_on_remember_cookie(self):
         Returns:
             None
         """
+        api_call: dict = Api(self.grafana_api_model).call_the_api(f"{APIEndpoints.LOGIN.value}/ping")
 
-        api_call: str = (
-            Api(self.grafana_api_model)
-            .call_the_api(f"{APIEndpoints.LOGIN.value}/ping")
-            .data.decode("utf-8")
-        )
-
-        if api_call != "Logged in":
+        if api_call.get("message") != "Logged in":
             logging.error(f"Check the error: {api_call}.")
             raise Exception
         else:

tests/integrationtest/test_service_account.py

@@ -75,10 +75,6 @@ def test_lifecycle_service_account(self):
             service_account_all_migrated.get("serviceAccounts")[0].get("id")
         )
 
-        self.assertEqual(
-            True, self.service_account.get_service_account_migration_status()
-        )
-
         token: dict = self.authentication.create_api_token("Test-migrated", "Viewer")
         self.service_account.migrate_api_key_to_service_account(token.get("id"))
         self.assertEqual(
@@ -88,16 +84,12 @@ def test_lifecycle_service_account(self):
             query="Test-migrated"
         )
 
-        self.service_account.revert_service_account_token_to_api_key(
-            service_account_migrated.get("serviceAccounts")[0].get("id"),
-            token.get("id"),
-        )
         self.assertEqual(
-            2, len(self.service_account.search_service_account().get("serviceAccounts"))
+            3, len(self.service_account.search_service_account().get("serviceAccounts"))
         )
 
         self.service_account.delete_service_account(service_account.get("id"))
+        self.service_account.delete_service_account(service_account_migrated.get("serviceAccounts")[0].get("id"))
         self.assertEqual(
             1, len(self.service_account.search_service_account().get("serviceAccounts"))
         )
-        self.authentication.delete_api_token(token.get("id"))

tests/integrationtest/test_team.py

@@ -79,7 +79,6 @@ def test_e_delete_team_member(self):
         self.team.delete_team_by_id(team_id)
 
     def test_get_team_preferences(self):
-        print(self.team.get_team_preferences(4))
         self.assertEqual(
             "tests", self.team.get_team_preferences(4).get("homeDashboardUID")
         )

tests/unittests/test_other_http.py

@@ -32,7 +32,7 @@ def test_renew_login_session_based_on_remember_cookie(self, call_the_api_mock):
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
         other_http: OtherHTTP = OtherHTTP(grafana_api_model=model)
 
-        call_the_api_mock.return_value.data = b"Logged in"
+        call_the_api_mock.return_value = dict({"message": "Logged in"})
 
         self.assertEqual(
             None, other_http.renew_login_session_based_on_remember_cookie()
@@ -45,7 +45,7 @@ def test_renew_login_session_based_on_remember_cookie_no_valid_result(
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
         other_http: OtherHTTP = OtherHTTP(grafana_api_model=model)
 
-        call_the_api_mock.return_value.data = b""
+        call_the_api_mock.return_value = dict()
 
         with self.assertRaises(Exception):
             other_http.renew_login_session_based_on_remember_cookie()