Skip to content

Commit

Permalink
Bug 1877527 - convert .ini manifests to .toml: batch 23 remaining pyt…
Browse files Browse the repository at this point in the history
…hon.ini r=jmaher,webdriver-reviewers,perftest-reviewers,sparky

Differential Revision: https://phabricator.services.mozilla.com/D200070
  • Loading branch information
tmarble committed Jan 31, 2024
1 parent f542aab commit 686ec09
Show file tree
Hide file tree
Showing 14 changed files with 72 additions and 58 deletions.
7 changes: 0 additions & 7 deletions layout/tools/reftest/selftest/python.ini

This file was deleted.

9 changes: 9 additions & 0 deletions layout/tools/reftest/selftest/python.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[DEFAULT]
subsuite = "reftest"
sequential = true

["test_python_manifest_parser.py"]

["test_reftest_manifest_parser.py"]

["test_reftest_output.py"]
4 changes: 0 additions & 4 deletions testing/condprofile/condprof/tests/python.ini

This file was deleted.

4 changes: 4 additions & 0 deletions testing/condprofile/condprof/tests/python.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[DEFAULT]
subsuite = "condprof"

["test_client.py"]

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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"]
9 changes: 0 additions & 9 deletions testing/mochitest/tests/python/python.ini

This file was deleted.

13 changes: 13 additions & 0 deletions testing/mochitest/tests/python/python.toml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions testing/raptor/test/python.ini

This file was deleted.

18 changes: 18 additions & 0 deletions testing/raptor/test/python.toml
Original file line number Diff line number Diff line change
@@ -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"]
6 changes: 0 additions & 6 deletions testing/talos/talos/unittests/python.ini

This file was deleted.

8 changes: 8 additions & 0 deletions testing/talos/talos/unittests/python.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[DEFAULT]
subsuite = "talos"

["test_config.py"]

["test_test.py"]

["test_xtalos.py"]
12 changes: 6 additions & 6 deletions toolkit/toolkit.mozbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 += [
Expand Down

0 comments on commit 686ec09

Please sign in to comment.