Skip to content

Commit

Permalink
Bug 1869430 - Batch 19.2 convert python unittest .ini -> .toml. r=gbr…
Browse files Browse the repository at this point in the history
…own,taskgraph-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D196124
  • Loading branch information
jmaher committed Dec 12, 2023
1 parent 7a2ed08 commit 009710f
Show file tree
Hide file tree
Showing 69 changed files with 523 additions and 339 deletions.
2 changes: 1 addition & 1 deletion config/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if CONFIG["HOST_OS_ARCH"] != "WINNT":
HostProgram("nsinstall_real")

PYTHON_UNITTEST_MANIFESTS += [
"tests/python.ini",
"tests/python.toml",
]

if CONFIG["CC_TYPE"] in ("clang", "gcc") and CONFIG["MOZ_OPTIMIZE"]:
Expand Down
7 changes: 0 additions & 7 deletions config/tests/python.ini

This file was deleted.

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

["test_mozbuild_reading.py"]

["unit-mozunit.py"]

["unit-nsinstall.py"]

["unit-printprereleasesuffix.py"]
2 changes: 1 addition & 1 deletion dom/bindings/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ with Files("mozwebidlcodegen/**.py"):


PYTHON_UNITTEST_MANIFESTS += [
"mozwebidlcodegen/test/python.ini",
"mozwebidlcodegen/test/python.toml",
]

if CONFIG["CC_TYPE"] == "gcc":
Expand Down
4 changes: 0 additions & 4 deletions dom/bindings/mozwebidlcodegen/test/python.ini

This file was deleted.

4 changes: 4 additions & 0 deletions dom/bindings/mozwebidlcodegen/test/python.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[DEFAULT]
subsuite = "mozbuild"

["test_mozwebidlcodegen.py"]
2 changes: 1 addition & 1 deletion modules/libpref/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ GeneratedFile(
)

PYTHON_UNITTEST_MANIFESTS += [
"test/python.ini",
"test/python.toml",
]

XPCOM_MANIFESTS += [
Expand Down
4 changes: 0 additions & 4 deletions modules/libpref/test/python.ini

This file was deleted.

4 changes: 4 additions & 0 deletions modules/libpref/test/python.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[DEFAULT]
subsuite = "mozbuild"

["test_generate_static_pref_list.py"]
22 changes: 0 additions & 22 deletions python/mach/mach/test/python.ini

This file was deleted.

34 changes: 34 additions & 0 deletions python/mach/mach/test/python.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[DEFAULT]
subsuite = "mach"

["test_commands.py"]

["test_conditions.py"]
skip-if = ["true"]

["test_config.py"]

["test_decorators.py"]

["test_dispatcher.py"]

["test_entry_point.py"]

["test_error_output.py"]
skip-if = ["true"]

["test_logger.py"]

["test_mach.py"]

["test_site.py"]

["test_site_activation.py"]

["test_site_compatibility.py"]
# The Windows and Mac workers only use the internal PyPI mirror,
# which will be missing packages required for this test.
skip-if = [
"os == 'win'",
"os == 'mac'",
]
18 changes: 9 additions & 9 deletions python/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ with Files("mach/docs/**"):
SCHEDULES.exclusive = ["docs"]

PYTHON_UNITTEST_MANIFESTS += [
"mach/mach/test/python.ini",
"mozboot/mozboot/test/python.ini",
"mozbuild/mozbuild/repackaging/test/python.ini",
"mozbuild/mozbuild/test/python.ini",
"mozbuild/mozpack/test/python.ini",
"mozlint/test/python.ini",
"mozrelease/test/python.ini",
"mozterm/test/python.ini",
"mozversioncontrol/test/python.ini",
"mach/mach/test/python.toml",
"mozboot/mozboot/test/python.toml",
"mozbuild/mozbuild/repackaging/test/python.toml",
"mozbuild/mozbuild/test/python.toml",
"mozbuild/mozpack/test/python.toml",
"mozlint/test/python.toml",
"mozrelease/test/python.toml",
"mozterm/test/python.toml",
"mozversioncontrol/test/python.toml",
]
4 changes: 0 additions & 4 deletions python/mozboot/mozboot/test/python.ini

This file was deleted.

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

["test_mozconfig.py"]
4 changes: 0 additions & 4 deletions python/mozbuild/mozbuild/repackaging/test/python.ini

This file was deleted.

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

["test_msix.py"]
65 changes: 0 additions & 65 deletions python/mozbuild/mozbuild/test/python.ini

This file was deleted.

123 changes: 123 additions & 0 deletions python/mozbuild/mozbuild/test/python.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
[DEFAULT]
subsuite = "mozbuild"

["action/test_buildlist.py"]

["action/test_html_fragment_preprocessor.py"]

["action/test_langpack_manifest.py"]

["action/test_node.py"]

["action/test_process_install_manifest.py"]

["backend/test_build.py"]

["backend/test_configenvironment.py"]

["backend/test_database.py"]

["backend/test_fastermake.py"]

["backend/test_partialconfigenvironment.py"]

["backend/test_recursivemake.py"]

["backend/test_test_manifest.py"]

["backend/test_visualstudio.py"]

["code_analysis/test_mach_commands.py"]

["codecoverage/test_lcov_rewrite.py"]

["compilation/test_warnings.py"]

["configure/lint.py"]

["configure/test_bootstrap.py"]

["configure/test_checks_configure.py"]

["configure/test_compile_checks.py"]

["configure/test_configure.py"]

["configure/test_lint.py"]

["configure/test_moz_configure.py"]

["configure/test_options.py"]

["configure/test_toolchain_configure.py"]

["configure/test_toolchain_helpers.py"]

["configure/test_toolkit_moz_configure.py"]

["configure/test_util.py"]

["controller/test_ccachestats.py"]

["controller/test_clobber.py"]

["frontend/test_context.py"]

["frontend/test_emitter.py"]

["frontend/test_namespaces.py"]

["frontend/test_reader.py"]

["frontend/test_sandbox.py"]

["repackaging/test_deb.py"]

["test_artifact_cache.py"]

["test_artifacts.py"]

["test_base.py"]

["test_containers.py"]

["test_dotproperties.py"]

["test_expression.py"]

["test_jarmaker.py"]

["test_licenses.py"]

["test_line_endings.py"]

["test_makeutil.py"]

["test_manifest.py"]

["test_mozconfig.py"]

["test_mozinfo.py"]

["test_preprocessor.py"]

["test_pythonutil.py"]

["test_rewrite_mozbuild.py"]

["test_telemetry.py"]

["test_telemetry_settings.py"]

["test_util.py"]

["test_util_fileavoidwrite.py"]

["test_vendor.py"]
skip-if = ["true"] # Bug 1765416
requirements = "python/mozbuild/mozbuild/test/vendor_requirements.txt"

["test_vendor_tools.py"]
skip-if = ["os == 'win'"] # Windows doesn't have the same path seperator as linux, and we just don't need to run it there

["vendor/test_vendor_manifest.py"]
18 changes: 0 additions & 18 deletions python/mozbuild/mozpack/test/python.ini

This file was deleted.

Loading

0 comments on commit 009710f

Please sign in to comment.