ETOS client now supports multiple suites from ESR (#25)

Author: t-persson

docs/conf.py

@@ -92,8 +92,8 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"etos_client"
-copyright = u"2020, Axis Communications AB"
+project = "etos_client"
+copyright = "2020, Axis Communications AB"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -241,7 +241,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "user_guide.tex", u"etos_client Documentation", u"", "manual"),
+    ("index", "user_guide.tex", "etos_client Documentation", "", "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

src/etos_client/lib/graphql.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Axis Communications AB.
+# Copyright 2020-2022 Axis Communications AB.
 #
 # For a full list of individual contributors, please see the commit history.
 #
@@ -18,6 +18,7 @@
     ARTIFACTS,
     ACTIVITY_TRIGGERED,
     ACTIVITY_CANCELED,
+    MAIN_TEST_SUITES_STARTED,
     TEST_SUITE_STARTED,
     TEST_SUITE_FINISHED,
     TEST_SUITE,
@@ -127,34 +128,48 @@ def request_test_suite_started(etos, activity_id):
     return None  # StopIteration
 
 
-def request_test_suite_finished(etos, test_suite_ids):
-    """Request test suite finished from graphql.
+def request_main_test_suites_started(etos, activity_id):
+    """Request test suite started 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 finished to search for.
-    :type test_suite_ids: list
-    :return: Iterator of test suite finished graphql responses.
+    :param activity_id: ID of activity in which the test suites started
+    :type activity_id: str
+    :return: Iterator of test suite started graphql responses.
     :rtype: iterator
     """
-    or_query = "{'$or': ["
-    or_query += ", ".join(
-        [
-            f"{{'links.type': 'TEST_SUITE_EXECUTION', 'links.target': '{test_suite_id}'}}"
-            for test_suite_id in test_suite_ids
-        ]
-    )
-    or_query += "]}"
-    for response in request(etos, TEST_SUITE_FINISHED % or_query):
+    for response in request(etos, MAIN_TEST_SUITES_STARTED % activity_id):
         if response:
-            for _, test_suite_finished in etos.graphql.search_for_nodes(
-                response, "testSuiteFinished"
+            for _, test_suite_started in etos.graphql.search_for_nodes(
+                response, "testSuiteStarted"
             ):
-                yield test_suite_finished
+                yield test_suite_started
             return None  # StopIteration
     return None  # StopIteration
 
 
+def request_test_suite_finished(etos, test_suite_id):
+    """Request test suite finished from graphql.
+
+    :param etos: Etos Library instance for communicating with ETOS.
+    :type etos: :obj:`etos_lib.etos.ETOS`
+    :param test_suite_id: Test suite started ID of which finished to search for.
+    :type test_suite_id: list
+    :return: Test suite finished graphql response.
+    :rtype: dict
+    """
+    for response in request(etos, TEST_SUITE_FINISHED % test_suite_id):
+        if response:
+            try:
+                _, test_suite_finished = next(
+                    etos.graphql.search_for_nodes(response, "testSuiteFinished")
+                )
+            except StopIteration:
+                return None
+            return test_suite_finished
+    return None
+
+
 def request_announcements(etos, ids):
     """Request announcements from graphql.
 

src/etos_client/lib/graphql_queries.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Axis Communications AB.
+# Copyright 2020-2022 Axis Communications AB.
 #
 # For a full list of individual contributors, please see the commit history.
 #
@@ -61,14 +61,24 @@
 
 TEST_SUITE_STARTED = """
 {
-  testSuiteStarted(search:"{'links.type': 'CONTEXT', 'links.target': '%s'}") {
+  testSuiteStarted(search:"{'links.type': 'CAUSE', 'links.target': '%s'}") {
     edges {
       node {
-        data {
-          testSuiteCategories {
-            type
-          }
+        meta {
+          id
         }
+      }
+    }
+  }
+}
+"""
+
+
+MAIN_TEST_SUITES_STARTED = """
+{
+  testSuiteStarted(search:"{'links.type': 'CONTEXT', 'links.target': '%s', 'data.categories': {'$ne': 'Sub suite'}}") {
+    edges {
+      node {
         meta {
           id
         }
@@ -81,7 +91,7 @@
 
 TEST_SUITE_FINISHED = """
 {
-  testSuiteFinished(search: "%s") {
+  testSuiteFinished(search: "{'links.type': 'TEST_SUITE_EXECUTION', 'links.target': '%s'}" last: 1) {
     edges {
       node {
         data {
@@ -93,15 +103,6 @@
             verdict
           }
         }
-        links {
-          ... on TestSuiteExecution {
-            testSuiteStarted {
-              meta {
-                id
-              }
-            }
-          }
-        }
       }
     }
   }

src/etos_client/lib/log_handler.py

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