Remove unnecessary confidence level waiting (#18)

* Remove unnecessary confidence level waiting

Author: t-persson

requirements.txt

@@ -20,4 +20,4 @@ halo==0.0.26
 requests==2.24.0
 gql==0.1.0
 packageurl-python==0.9.1
-etos_lib==1.23.0
+etos_lib==1.24.0

setup.cfg

@@ -34,7 +34,7 @@ install_requires =
     requests==2.24.0 
     gql==0.1.0 
     packageurl-python==0.9.1
-    etos_lib==1.23.0
+    etos_lib==1.24.0
 
 # Require a specific Python version, e.g. Python 2.7 or >= 3.4
 python_requires = >=3.4

src/etos_client/lib/graphql.py

@@ -1,4 +1,4 @@
-# Copyright 2020 Axis Communications AB.
+# Copyright 2020-2021 Axis Communications AB.
 #
 # For a full list of individual contributors, please see the commit history.
 #
@@ -18,7 +18,6 @@
     ARTIFACTS,
     ACTIVITY_TRIGGERED,
     ACTIVITY_CANCELED,
-    CONFIDENCE_LEVEL,
     TEST_SUITE_STARTED,
     TEST_SUITE_FINISHED,
     TEST_SUITE,
@@ -157,34 +156,6 @@ def request_test_suite_finished(etos, test_suite_ids):
     return None  # StopIteration
 
 
-def request_confidence_level(etos, test_suite_ids):
-    """Request confidence levels from graphql.
-
-    :param etos: Etos Library instance for communicating with ETOS.
-    :type etos: :obj:`etos_lib.etos.ETOS`
-    :param test_suite_ids: list of test suite started IDs of which confidences to search for.
-    :type test_suite_ids: list
-    :return: Iterator of confidence level modified graphql responses.
-    :rtype: iterator
-    """
-    or_query = "{'$or': ["
-    or_query += ", ".join(
-        [
-            "{'links.type': 'CAUSE', 'links.target': '%s'}" % test_suite_id
-            for test_suite_id in test_suite_ids
-        ]
-    )
-    or_query += "]}"
-    for response in request(etos, CONFIDENCE_LEVEL % or_query):
-        if response:
-            for _, confidence_level in etos.graphql.search_for_nodes(
-                response, "confidenceLevelModified"
-            ):
-                yield confidence_level
-            return None  # StopIteration
-    return None  # StopIteration
-
-
 def request_announcements(etos, ids):
     """Request announcements from graphql.
 

src/etos_client/lib/graphql_queries.py

@@ -1,4 +1,4 @@
-# Copyright 2020 Axis Communications AB.
+# Copyright 2020-2021 Axis Communications AB.
 #
 # For a full list of individual contributors, please see the commit history.
 #
@@ -108,35 +108,6 @@
 }
 """
 
-CONFIDENCE_LEVEL = """
-{
-  confidenceLevelModified(search: "%s") {
-    edges {
-      node {
-        data {
-          name
-          value
-        }
-        meta {
-          id
-        }
-        links {
-          ... on Cause {
-            links {
-              ... on TestSuiteStarted {
-                meta {
-                  id
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-"""
-
 
 ANNOUNCEMENTS = """
 {

src/etos_client/lib/log_handler.py

@@ -1,4 +1,4 @@
-# Copyright 2020 Axis Communications AB.
+# Copyright 2020-2021 Axis Communications AB.
 #
 # For a full list of individual contributors, please see the commit history.
 #

src/etos_client/lib/test_result_handler.py

@@ -20,7 +20,6 @@
 from .graphql import (
     request_activity,
     request_activity_canceled,
-    request_confidence_level,
     request_test_suite_finished,
     request_test_suite_started,
     request_suite,
@@ -235,21 +234,6 @@ def get_events(self, suite_id):
             for main_suite in finished
             if main_suite_link in main_suite["links"]
         ]
-
-        main_suite_link = {"links": {"meta": {"id": main_suite["meta"]["id"]}}}
-        confidence = list(request_confidence_level(self.etos, started_ids))
-        if not confidence:
-            return results
-        results["confidenceLevelModified"] = [
-            sub_confidence
-            for sub_confidence in confidence
-            if main_suite_link not in sub_confidence["links"]
-        ]
-        results["mainConfidenceLevelModified"] = [
-            main_confidence
-            for main_confidence in confidence
-            if main_suite_link in main_confidence["links"]
-        ]
         return results
 
     def print_suite(self, spinner):