Merge pull request #338 from espressif/fix/record-app_path-in-junit

fix: record app_path in junit reports
espressif · Jan 29, 2025 · 41bfcd9 · 41bfcd9
2 parents 88c955b + 8484ed6
commit 41bfcd9
Show file tree

Hide file tree

Showing 13 changed files with 464 additions and 270 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,2 +1,3 @@
 # ruff, ruff-format
 3f0008207d272b7fa4329d86a157f4533f1a441f
+a90b0d0c35a8e1c6896130e23c46cedee48b4158
diff --git a/pytest-embedded-arduino/tests/test_arduino.py b/pytest-embedded-arduino/tests/test_arduino.py
@@ -17,9 +17,12 @@ def test_arduino_app(app, dut):
 
     result = testdir.runpytest(
         '-s',
-        '--embedded-services', 'arduino,esp',
-        '--app-path', os.path.join(testdir.tmpdir, 'hello_world_arduino'),
-        '--build-dir', 'build',
+        '--embedded-services',
+        'arduino,esp',
+        '--app-path',
+        os.path.join(testdir.tmpdir, 'hello_world_arduino'),
+        '--build-dir',
+        'build',
     )
 
     result.assert_outcomes(passed=1)
diff --git a/pytest-embedded-idf/pytest_embedded_idf/unity_tester.py b/pytest-embedded-idf/pytest_embedded_idf/unity_tester.py
@@ -288,7 +288,9 @@ def wrapper(self, *args, **kwargs):
                 finally:
                     _end_at = time.perf_counter()
                     self._add_single_unity_test_case(
-                        _case, _log, additional_attrs={'time': round(_end_at - _start_at, 3)}
+                        _case,
+                        _log,
+                        additional_attrs={'app_path': self.app.app_path, 'time': round(_end_at - _start_at, 3)},
                     )
 
         return wrapper
@@ -695,6 +697,8 @@ def process_raw_report_data(self, raw_data_to_report) -> t.Dict:
         if log:
             attrs.update({'stdout': log})
 
+        attrs.update({'app_path': self.dut.app.app_path})
+
         return attrs
 
     def add_to_report(self, attrs):
@@ -765,9 +769,6 @@ def gather(self):
             for _t in self.workers:
                 _t.close()
 
-    def get_processed_report_data(self, res: t.List[t.Any]) -> t.List[t.Dict]:
-        return [self.workers[i].process_raw_report_data(res[i]) for i in range(len(res))]
-
     @staticmethod
     def get_merge_data(test_cases_attr: t.List[t.Dict]) -> t.Dict:
         output = {}
@@ -794,6 +795,8 @@ def get_merge_data(test_cases_attr: t.List[t.Dict]) -> t.Dict:
         for k, val in output.items():
             if k in ('file', 'line'):
                 output[k] = val[0]
+            elif k == 'app_path':
+                output[k] = '|'.join(val)
             else:
                 output[k] = '<------------------->\n'.join(val)