From 686ec0982493192b1182b3b0dff646595a69e3d1 Mon Sep 17 00:00:00 2001 From: Tom Marble Date: Wed, 31 Jan 2024 16:02:22 +0000 Subject: [PATCH] Bug 1877527 - convert .ini manifests to .toml: batch 23 remaining python.ini r=jmaher,webdriver-reviewers,perftest-reviewers,sparky Differential Revision: https://phabricator.services.mozilla.com/D200070 --- layout/tools/reftest/selftest/python.ini | 7 ------- layout/tools/reftest/selftest/python.toml | 9 +++++++++ testing/condprofile/condprof/tests/python.ini | 4 ---- testing/condprofile/condprof/tests/python.toml | 4 ++++ .../tests/harness_unit/python.ini | 9 --------- .../tests/harness_unit/python.toml | 14 ++++++++++++++ testing/mochitest/tests/python/python.ini | 9 --------- testing/mochitest/tests/python/python.toml | 13 +++++++++++++ .../manifestparser/manifestparser.py | 6 ------ testing/raptor/test/python.ini | 11 ----------- testing/raptor/test/python.toml | 18 ++++++++++++++++++ testing/talos/talos/unittests/python.ini | 6 ------ testing/talos/talos/unittests/python.toml | 8 ++++++++ toolkit/toolkit.mozbuild | 12 ++++++------ 14 files changed, 72 insertions(+), 58 deletions(-) delete mode 100644 layout/tools/reftest/selftest/python.ini create mode 100644 layout/tools/reftest/selftest/python.toml delete mode 100644 testing/condprofile/condprof/tests/python.ini create mode 100644 testing/condprofile/condprof/tests/python.toml delete mode 100644 testing/marionette/harness/marionette_harness/tests/harness_unit/python.ini create mode 100644 testing/marionette/harness/marionette_harness/tests/harness_unit/python.toml delete mode 100644 testing/mochitest/tests/python/python.ini create mode 100644 testing/mochitest/tests/python/python.toml delete mode 100644 testing/raptor/test/python.ini create mode 100644 testing/raptor/test/python.toml delete mode 100644 testing/talos/talos/unittests/python.ini create mode 100644 testing/talos/talos/unittests/python.toml diff --git a/layout/tools/reftest/selftest/python.ini b/layout/tools/reftest/selftest/python.ini deleted file mode 100644 index 6c4dd9c7134a8..0000000000000 --- a/layout/tools/reftest/selftest/python.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -subsuite=reftest -sequential=true - -[test_python_manifest_parser.py] -[test_reftest_manifest_parser.py] -[test_reftest_output.py] diff --git a/layout/tools/reftest/selftest/python.toml b/layout/tools/reftest/selftest/python.toml new file mode 100644 index 0000000000000..81269598f2074 --- /dev/null +++ b/layout/tools/reftest/selftest/python.toml @@ -0,0 +1,9 @@ +[DEFAULT] +subsuite = "reftest" +sequential = true + +["test_python_manifest_parser.py"] + +["test_reftest_manifest_parser.py"] + +["test_reftest_output.py"] diff --git a/testing/condprofile/condprof/tests/python.ini b/testing/condprofile/condprof/tests/python.ini deleted file mode 100644 index ec105582f198b..0000000000000 --- a/testing/condprofile/condprof/tests/python.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -subsuite = condprof - -[test_client.py] diff --git a/testing/condprofile/condprof/tests/python.toml b/testing/condprofile/condprof/tests/python.toml new file mode 100644 index 0000000000000..14cffb2f5c3f4 --- /dev/null +++ b/testing/condprofile/condprof/tests/python.toml @@ -0,0 +1,4 @@ +[DEFAULT] +subsuite = "condprof" + +["test_client.py"] diff --git a/testing/marionette/harness/marionette_harness/tests/harness_unit/python.ini b/testing/marionette/harness/marionette_harness/tests/harness_unit/python.ini deleted file mode 100644 index a0864a129ac1d..0000000000000 --- a/testing/marionette/harness/marionette_harness/tests/harness_unit/python.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -subsuite = marionette-harness - -[test_httpd.py] -[test_marionette_arguments.py] -[test_marionette_harness.py] -[test_marionette_runner.py] -[test_marionette_test_result.py] -[test_serve.py] diff --git a/testing/marionette/harness/marionette_harness/tests/harness_unit/python.toml b/testing/marionette/harness/marionette_harness/tests/harness_unit/python.toml new file mode 100644 index 0000000000000..7ae7a32440006 --- /dev/null +++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/python.toml @@ -0,0 +1,14 @@ +[DEFAULT] +subsuite = "marionette-harness" + +["test_httpd.py"] + +["test_marionette_arguments.py"] + +["test_marionette_harness.py"] + +["test_marionette_runner.py"] + +["test_marionette_test_result.py"] + +["test_serve.py"] diff --git a/testing/mochitest/tests/python/python.ini b/testing/mochitest/tests/python/python.ini deleted file mode 100644 index ecdf4f39b680a..0000000000000 --- a/testing/mochitest/tests/python/python.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -subsuite = mochitest - -[test_mochitest_integration.py] -sequential = true -[test_build_profile.py] -[test_get_active_tests.py] -[test_message_logger.py] -[test_create_directories.py] diff --git a/testing/mochitest/tests/python/python.toml b/testing/mochitest/tests/python/python.toml new file mode 100644 index 0000000000000..d82844144ef9b --- /dev/null +++ b/testing/mochitest/tests/python/python.toml @@ -0,0 +1,13 @@ +[DEFAULT] +subsuite = "mochitest" + +["test_build_profile.py"] + +["test_create_directories.py"] + +["test_get_active_tests.py"] + +["test_message_logger.py"] + +["test_mochitest_integration.py"] +sequential = true diff --git a/testing/mozbase/manifestparser/manifestparser/manifestparser.py b/testing/mozbase/manifestparser/manifestparser/manifestparser.py index 16575f7287747..63eaeefe052a0 100644 --- a/testing/mozbase/manifestparser/manifestparser/manifestparser.py +++ b/testing/mozbase/manifestparser/manifestparser/manifestparser.py @@ -167,7 +167,6 @@ def _read(self, root, filename, defaults, parentmanifest=None): def read_file(type): include_file = section.split(type, 1)[-1] - self.logger.debug_ci(f"INCLUDE: {include_file}") include_file = normalize_path(include_file) if not os.path.isabs(include_file): include_file = os.path.join(here, include_file) @@ -213,17 +212,12 @@ def read_file(type): if self.use_toml: fp, filename = self._get_fp_filename(toml_name) read_fn = read_toml - self.logger.debug_ci(f"Reading TOML instead of INI: {filename}") else: self.logger.debug_ci( f"NOTE TOML present, but not used: {toml_name}" ) - self.logger.debug_ci(f"Reading INI: {filename}") - else: - self.logger.debug_ci(f"Reading INI: {filename}") elif file_ext == ".toml": read_fn = read_toml - self.logger.debug_ci(f"Reading TOML: {filename}") else: raise IOError(f"manfestparser file extension not supported: {filename}") defaults["here"] = here diff --git a/testing/raptor/test/python.ini b/testing/raptor/test/python.ini deleted file mode 100644 index 91365465451fa..0000000000000 --- a/testing/raptor/test/python.ini +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -subsuite = raptor - -[test_cmdline.py] -[test_manifest.py] -[test_utils.py] -[test_playback.py] -[test_print_tests.py] -[test_raptor.py] -[test_gecko_profile.py] -[test_chrome_trace.py] diff --git a/testing/raptor/test/python.toml b/testing/raptor/test/python.toml new file mode 100644 index 0000000000000..f166b48fae488 --- /dev/null +++ b/testing/raptor/test/python.toml @@ -0,0 +1,18 @@ +[DEFAULT] +subsuite = "raptor" + +["test_chrome_trace.py"] + +["test_cmdline.py"] + +["test_gecko_profile.py"] + +["test_manifest.py"] + +["test_playback.py"] + +["test_print_tests.py"] + +["test_raptor.py"] + +["test_utils.py"] diff --git a/testing/talos/talos/unittests/python.ini b/testing/talos/talos/unittests/python.ini deleted file mode 100644 index 9a5ef36ca0935..0000000000000 --- a/testing/talos/talos/unittests/python.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -subsuite = talos - -[test_config.py] -[test_test.py] -[test_xtalos.py] diff --git a/testing/talos/talos/unittests/python.toml b/testing/talos/talos/unittests/python.toml new file mode 100644 index 0000000000000..d94b347db20e3 --- /dev/null +++ b/testing/talos/talos/unittests/python.toml @@ -0,0 +1,8 @@ +[DEFAULT] +subsuite = "talos" + +["test_config.py"] + +["test_test.py"] + +["test_xtalos.py"] diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild index f554b692f7e87..b697eb1e3b02b 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -7,12 +7,12 @@ include("/js/app.mozbuild") PYTHON_UNITTEST_MANIFESTS += [ - "/layout/tools/reftest/selftest/python.ini", - "/testing/condprofile/condprof/tests/python.ini", - "/testing/marionette/harness/marionette_harness/tests/harness_unit/python.ini", - "/testing/mochitest/tests/python/python.ini", - "/testing/raptor/test/python.ini", - "/testing/talos/talos/unittests/python.ini", + "/layout/tools/reftest/selftest/python.toml", + "/testing/condprofile/condprof/tests/python.toml", + "/testing/marionette/harness/marionette_harness/tests/harness_unit/python.toml", + "/testing/mochitest/tests/python/python.toml", + "/testing/raptor/test/python.toml", + "/testing/talos/talos/unittests/python.toml", ] DIRS += [