Move test files into sub-directories

EnricoMi · May 23, 2022 · fa1d315 · fa1d315
1 parent 817c56d
commit fa1d315
Show file tree

Hide file tree

Showing 30 changed files with 4 additions and 5 deletions.
diff --git a/...gresearch.spark.diff.DiffOptionsSuite.xml → ...gresearch.spark.diff.DiffOptionsSuite.xml b/...gresearch.spark.diff.DiffOptionsSuite.xml → ...gresearch.spark.diff.DiffOptionsSuite.xml
diff --git a/python/test/files/corrupt-xml.xml → python/test/files/junit/corrupt-xml.xml b/python/test/files/corrupt-xml.xml → python/test/files/junit/corrupt-xml.xml
diff --git a/python/test/files/disabled.xml → python/test/files/junit/disabled.xml b/python/test/files/disabled.xml → python/test/files/junit/disabled.xml
diff --git a/python/test/files/empty.xml → python/test/files/junit/empty.xml b/python/test/files/empty.xml → python/test/files/junit/empty.xml
diff --git a/python/test/files/junit.fail.xml → python/test/files/junit/junit.fail.xml b/python/test/files/junit.fail.xml → python/test/files/junit/junit.fail.xml
diff --git a/...est/files/junit.gloo.elastic.spark.tf.xml → ...les/junit/junit.gloo.elastic.spark.tf.xml b/...est/files/junit.gloo.elastic.spark.tf.xml → ...les/junit/junit.gloo.elastic.spark.tf.xml
diff --git a/.../files/junit.gloo.elastic.spark.torch.xml → .../junit/junit.gloo.elastic.spark.torch.xml b/.../files/junit.gloo.elastic.spark.torch.xml → .../junit/junit.gloo.elastic.spark.torch.xml
diff --git a/python/test/files/junit.gloo.elastic.xml → ...n/test/files/junit/junit.gloo.elastic.xml b/python/test/files/junit.gloo.elastic.xml → ...n/test/files/junit/junit.gloo.elastic.xml
diff --git a/python/test/files/junit.gloo.standalone.xml → ...est/files/junit/junit.gloo.standalone.xml b/python/test/files/junit.gloo.standalone.xml → ...est/files/junit/junit.gloo.standalone.xml
diff --git a/python/test/files/junit.gloo.static.xml → ...on/test/files/junit/junit.gloo.static.xml b/python/test/files/junit.gloo.static.xml → ...on/test/files/junit/junit.gloo.static.xml
diff --git a/python/test/files/junit.mpi.integration.xml → ...est/files/junit/junit.mpi.integration.xml b/python/test/files/junit.mpi.integration.xml → ...est/files/junit/junit.mpi.integration.xml
diff --git a/python/test/files/junit.mpi.standalone.xml → ...test/files/junit/junit.mpi.standalone.xml b/python/test/files/junit.mpi.standalone.xml → ...test/files/junit/junit.mpi.standalone.xml
diff --git a/python/test/files/junit.mpi.static.xml → python/test/files/junit/junit.mpi.static.xml b/python/test/files/junit.mpi.static.xml → python/test/files/junit/junit.mpi.static.xml
diff --git a/python/test/files/junit.multiresult.xml → ...on/test/files/junit/junit.multiresult.xml b/python/test/files/junit.multiresult.xml → ...on/test/files/junit/junit.multiresult.xml
diff --git a/.../test/files/junit.spark.integration.1.xml → ...files/junit/junit.spark.integration.1.xml b/.../test/files/junit.spark.integration.1.xml → ...files/junit/junit.spark.integration.1.xml
diff --git a/.../test/files/junit.spark.integration.2.xml → ...files/junit/junit.spark.integration.2.xml b/.../test/files/junit.spark.integration.2.xml → ...files/junit/junit.spark.integration.2.xml
diff --git a/python/test/files/minimal-attributes.xml → ...n/test/files/junit/minimal-attributes.xml b/python/test/files/minimal-attributes.xml → ...n/test/files/junit/minimal-attributes.xml
diff --git a/python/test/files/no-attributes.xml → python/test/files/junit/no-attributes.xml b/python/test/files/no-attributes.xml → python/test/files/junit/no-attributes.xml
diff --git a/python/test/files/no-cases-but-tests.xml → ...n/test/files/junit/no-cases-but-tests.xml b/python/test/files/no-cases-but-tests.xml → ...n/test/files/junit/no-cases-but-tests.xml
diff --git a/python/test/files/no-cases.xml → python/test/files/junit/no-cases.xml b/python/test/files/no-cases.xml → python/test/files/junit/no-cases.xml
diff --git a/python/test/files/non-junit.xml → python/test/files/junit/non-junit.xml b/python/test/files/non-junit.xml → python/test/files/junit/non-junit.xml
diff --git a/python/test/files/non-xml.xml → python/test/files/junit/non-xml.xml b/python/test/files/non-xml.xml → python/test/files/junit/non-xml.xml
diff --git a/python/test/files/testcase-in-testcase.xml → ...test/files/junit/testcase-in-testcase.xml b/python/test/files/testcase-in-testcase.xml → ...test/files/junit/testcase-in-testcase.xml
diff --git a/python/test/files/unsupported-unicode.xml → .../test/files/junit/unsupported-unicode.xml b/python/test/files/unsupported-unicode.xml → .../test/files/junit/unsupported-unicode.xml
diff --git a/python/test/files/with-xml-entities.xml → ...on/test/files/junit/with-xml-entities.xml b/python/test/files/with-xml-entities.xml → ...on/test/files/junit/with-xml-entities.xml
diff --git a/python/test/files/xunit.xml → python/test/files/junit/xunit.xml b/python/test/files/xunit.xml → python/test/files/junit/xunit.xml
diff --git a/python/test/files/mstest.trx → python/test/files/mstest/mstest.trx b/python/test/files/mstest.trx → python/test/files/mstest/mstest.trx
diff --git a/python/test/test_action_script.py b/python/test/test_action_script.py
@@ -779,8 +779,8 @@ def test_get_files_with_mock(self):
 
     def test_parse_files(self):
         gha = mock.MagicMock()
-        settings = self.get_settings(junit_files_glob=str(test_files_path / '*.xml'),
-                                     trx_files_glob=str(test_files_path / '*.trx'))
+        settings = self.get_settings(junit_files_glob=str(test_files_path / 'junit' / '*.xml'),
+                                     trx_files_glob=str(test_files_path / 'mstest' / '*.trx'))
         actual = parse_files(settings, gha)
 
         gha.warning.assert_not_called()

diff --git a/python/test/test_junit.py b/python/test/test_junit.py
@@ -8,7 +8,7 @@
 from publish.junit import parse_junit_xml_files, process_junit_xml_elems, get_results, get_result, get_content, get_message, Disabled
 from publish.unittestresults import ParsedUnitTestResults, UnitTestCase, ParseError
 
-test_files_path = pathlib.Path(__file__).parent / 'files'
+test_files_path = pathlib.Path(__file__).parent / 'files' / 'junit'
 
 
 class TestElement(Element):

diff --git a/python/test/test_publish.py b/python/test/test_publish.py
@@ -1,6 +1,5 @@
 import contextlib
 import locale
-import os
 import pathlib
 import unittest
 
@@ -12,7 +11,7 @@
 from publish.unittestresults import get_test_results
 from test import d, n
 
-test_files_path = pathlib.Path(__file__).parent / 'files'
+test_files_path = pathlib.Path(__file__).parent / 'files' / 'junit'
 
 @contextlib.contextmanager
 def temp_locale(encoding: str) -> Any: