pytest-embedded 1.4.1__tar.gz → 1.4.2__tar.gz

{pytest_embedded-1.4.1 → pytest_embedded-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-embedded
-Version: 1.4.1
+Version: 1.4.2
 Summary: A pytest plugin that designed for embedded testing.
 Author-email: Fu Hanxi <fuhanxi@espressif.com>
 Requires-Python: >=3.7

{pytest_embedded-1.4.1 → pytest_embedded-1.4.2}/pytest_embedded/__init__.py

@@ -5,4 +5,4 @@ from .dut import Dut
 
 __all__ = ['App', 'Dut']
 
-__version__ = '1.4.1'
+__version__ = '1.4.2'

{pytest_embedded-1.4.1 → pytest_embedded-1.4.2}/pytest_embedded/unity.py

@@ -248,8 +248,6 @@ class JunitMerger:
                     logging.info(f'Merging {_junit_file} to {merged_dut_junit_filepath}')
                     _junit = ET.parse(_junit_file)
                     _root = _junit.getroot()
-                    for case in _root:  # one level down
-                        case.attrib['name'] += f' [{os.path.splitext(os.path.basename(_junit_file))[0]}]'
 
                     if _data is None:
                         _data = _junit
@@ -273,11 +271,7 @@ class JunitMerger:
             elif _junit_files[0] != merged_dut_junit_filepath:
                 _junit_file = _junit_files[0]
                 logging.info(f'Rename {_junit_file} to {merged_dut_junit_filepath}')
-                _junit = ET.parse(_junit_file)
-                _root = _junit.getroot()
-                for case in _root:  # one level down
-                    case.attrib['name'] += f' [{os.path.splitext(os.path.basename(_junit_file))[0]}]'
-                _junit.write(merged_dut_junit_filepath)
+                os.rename(_junit_file, merged_dut_junit_filepath)
 
             _merged_multi_dut_junit_files.append(merged_dut_junit_filepath)
 

{pytest_embedded-1.4.1 → pytest_embedded-1.4.2}/tests/test_base.py

@@ -419,19 +419,32 @@ def test_expect_unity_test_output_multi_dut(testdir):
     assert junit_report.attrib['skipped'] == '0'
     assert junit_report.attrib['tests'] == '12'
 
-    case_names = [
-        'test_case',
-        'test_case_2',
-        'test case 3',
-        'test case 4',
-    ]
-    required_names = []
-    for dut in ['dut-0', 'dut-1', 'dut-1']:
-        required_names.extend([f'{case_name} [{dut}]' for case_name in case_names])
-
-    all_case_names = [item.attrib['name'] for item in junit_report]
-
-    assert sorted(required_names) == sorted(all_case_names)
+    assert junit_report[0].get('name') == 'test_case'
+    assert junit_report[0].find('failure') is not None
+    assert junit_report[1].get('name') == 'test_case_2'
+    assert junit_report[1].find('failure') is not None
+    assert junit_report[2].get('name') == 'test case 3'
+    assert junit_report[2].find('failure') is None
+    assert junit_report[3].get('name') == 'test case 4'
+    assert junit_report[3].find('failure') is not None
+
+    assert junit_report[4].get('name') == 'test_case'
+    assert junit_report[4].find('failure') is not None
+    assert junit_report[5].get('name') == 'test_case_2'
+    assert junit_report[5].find('failure') is not None
+    assert junit_report[6].get('name') == 'test case 3'
+    assert junit_report[6].find('failure') is None
+    assert junit_report[7].get('name') == 'test case 4'
+    assert junit_report[7].find('failure') is not None
+
+    assert junit_report[8].get('name') == 'test_case'
+    assert junit_report[8].find('failure') is not None
+    assert junit_report[9].get('name') == 'test_case_2'
+    assert junit_report[9].find('failure') is not None
+    assert junit_report[10].get('name') == 'test case 3'
+    assert junit_report[10].find('failure') is None
+    assert junit_report[11].get('name') == 'test case 4'
+    assert junit_report[11].find('failure') is not None
 
 
 def test_expect_unity_test_output_multi_dut_with_illegal_chars(testdir):
@@ -472,13 +485,11 @@ def test_expect_unity_test_output_multi_dut_with_illegal_chars(testdir):
     assert junit_report.attrib['skipped'] == '0'
     assert junit_report.attrib['tests'] == '2'
 
-    required_names = [
-        'test_case [dut-0]',
-        'test_case [dut-1]',
-    ]
-    all_case_names = [item.attrib['name'] for item in junit_report]
+    assert junit_report[0].get('name') == 'test_case'
+    assert junit_report[0].find('failure') is not None
+    assert junit_report[1].get('name') == 'test_case'
+    assert junit_report[1].find('failure') is not None
 
-    assert sorted(required_names) == sorted(all_case_names)
 
 
 def test_duplicate_stdout_popen(testdir):