ISSUE-662: Return extra_marks as submission object rather than individual test object

Author: Naragod

server/autotest_server/__init__.py

@@ -83,6 +83,8 @@ def _create_test_group_result(
             result["annotations"] = res["annotations"]
         elif "tags" in res:
             result["tags"] = res["tags"]
+        elif "extra_marks" in res:
+            result["extra_marks"] = res["extra_marks"]
         elif "overall_comment" in res:
             result["overall_comment"] = res["overall_comment"]
         else:

server/autotest_server/testers/py/py_tester.py

@@ -103,6 +103,7 @@ def __init__(self) -> None:
         self.results = {}
         self.tags = set()
         self.annotations = []
+        self.extra_marks = {}
         self.overall_comments = []
 
     def pytest_configure(self, config):
@@ -181,18 +182,18 @@ def _process_markers(self, item):
                 self.results[item.nodeid]["marks_earned"] = marker.args[0]
             elif marker.name == "markus_extra_marks" and marker.args != [] and item.nodeid in self.results:
                 self.results[item.nodeid]["marks_earned"] += marker.args[0]
-                bonus_comment = {
+                extra_mark = {
                     "id": str(uuid.uuid4()),
                     "mark": marker.args[0],
                     "fn": item.nodeid,
                     "description": marker.args[1],
                     "unit": marker.args[2] if len(marker.args) > 2 else "points",
                 }
 
-                if self.results[item.nodeid].get("bonus_comments"):
-                    self.results[item.nodeid]["bonus_comments"].append(bonus_comment)
+                if self.extra_marks.get(item.nodeid):
+                    self.extra_marks[item.nodeid].append(extra_mark)
                 else:
-                    self.results[item.nodeid]["bonus_comments"] = [bonus_comment]
+                    self.extra_marks[item.nodeid] = [extra_mark]
 
     def pytest_collectreport(self, report):
         """
@@ -282,6 +283,7 @@ def __init__(
         """
         super().__init__(specs, test_class, resource_settings=resource_settings)
         self.annotations = []
+        self.extra_marks = {}
         self.overall_comments = []
         self.tags = set()
 
@@ -326,6 +328,7 @@ def _run_pytest_tests(self, test_file: str) -> List[Dict]:
                 results.extend(plugin.results.values())
                 self.annotations = plugin.annotations
                 self.overall_comments = plugin.overall_comments
+                self.extra_marks = plugin.extra_marks
                 self.tags = plugin.tags
             finally:
                 sys.stdout = sys.__stdout__
@@ -363,3 +366,5 @@ def after_tester_run(self) -> None:
             print(self.test_class.format_tags(self.tags))
         if self.overall_comments:
             print(self.test_class.format_overall_comment(self.overall_comments, separator="\n\n"))
+        if self.extra_marks:
+            print(self.test_class.format_extra_marks(self.extra_marks))

server/autotest_server/testers/tester.py

@@ -110,6 +110,15 @@ def format_overall_comment(overall_comment_data: str | Iterable[str], separator:
             content = separator.join(overall_comment_data)
         return json.dumps({"overall_comment": content})
 
+    @staticmethod
+    def format_extra_marks(extra_marks: Dict[str, Any]) -> str:
+        """
+        Formats extra marks data.
+        :param extra_marks: the contents of the extra marks
+        :return a json string representation of the extra marks data.
+        """
+        return json.dumps({"extra_marks": extra_marks})
+
     @staticmethod
     def format_tags(tag_data: Iterable[str | dict[str, str]]) -> str:
         """