diff --git a/build/compare-mozconfig/python.ini b/build/compare-mozconfig/python.ini index 3fb5cfdab1ea..386332648951 100644 --- a/build/compare-mozconfig/python.ini +++ b/build/compare-mozconfig/python.ini @@ -1 +1,4 @@ +[DEFAULT] +skip-if = python == 3 + [compare-mozconfigs.py] diff --git a/config/tests/python.ini b/config/tests/python.ini index f30dbcbf4415..572873cdf6aa 100644 --- a/config/tests/python.ini +++ b/config/tests/python.ini @@ -1,3 +1,6 @@ +[DEFAULT] +skip-if = python == 3 + [test_mozbuild_reading.py] [unit-mozunit.py] [unit-nsinstall.py] diff --git a/dom/bindings/mozwebidlcodegen/test/python.ini b/dom/bindings/mozwebidlcodegen/test/python.ini index ad7a038572f5..09bb01f14177 100644 --- a/dom/bindings/mozwebidlcodegen/test/python.ini +++ b/dom/bindings/mozwebidlcodegen/test/python.ini @@ -1 +1,4 @@ +[DEFAULT] +skip-if = python == 3 + [test_mozwebidlcodegen.py] diff --git a/layout/tools/reftest/selftest/python.ini b/layout/tools/reftest/selftest/python.ini index 5eda69c04ef9..714fe851ffbf 100644 --- a/layout/tools/reftest/selftest/python.ini +++ b/layout/tools/reftest/selftest/python.ini @@ -1,5 +1,6 @@ [DEFAULT] subsuite=reftest sequential=true +skip-if = python == 3 [test_reftest_output.py] diff --git a/mozglue/linker/tests/python.ini b/mozglue/linker/tests/python.ini index c8a66652b84f..012b0863347e 100644 --- a/mozglue/linker/tests/python.ini +++ b/mozglue/linker/tests/python.ini @@ -1 +1,4 @@ +[DEFAULT] +skip-if = python == 3 + [run_test_zip.py] diff --git a/python/mach/mach/test/python.ini b/python/mach/mach/test/python.ini index 3ba8d2ed833e..fdecfac3e52d 100644 --- a/python/mach/mach/test/python.ini +++ b/python/mach/mach/test/python.ini @@ -1,3 +1,6 @@ +[DEFAULT] +skip-if = python == 3 + [test_conditions.py] [test_config.py] [test_dispatcher.py] diff --git a/python/mozbuild/dumbmake/test/python.ini b/python/mozbuild/dumbmake/test/python.ini index 901a93321e41..2debb1260f05 100644 --- a/python/mozbuild/dumbmake/test/python.ini +++ b/python/mozbuild/dumbmake/test/python.ini @@ -1 +1,4 @@ +[DEFAULT] +skip-if = python == 3 + [test_dumbmake.py] diff --git a/python/mozbuild/mozbuild/test/python.ini b/python/mozbuild/mozbuild/test/python.ini index bc04c406a2f7..f2e19cd3cf69 100644 --- a/python/mozbuild/mozbuild/test/python.ini +++ b/python/mozbuild/mozbuild/test/python.ini @@ -1,3 +1,6 @@ +[DEFAULT] +skip-if = python == 3 + [action/test_buildlist.py] [action/test_langpack_manifest.py] [action/test_process_install_manifest.py] diff --git a/python/mozbuild/mozpack/test/python.ini b/python/mozbuild/mozpack/test/python.ini index 87d52e7f60c4..c38893e19d18 100644 --- a/python/mozbuild/mozpack/test/python.ini +++ b/python/mozbuild/mozpack/test/python.ini @@ -1,3 +1,6 @@ +[DEFAULT] +skip-if = python == 3 + [test_chrome_flags.py] [test_chrome_manifest.py] [test_copier.py] diff --git a/python/mozlint/test/python.ini b/python/mozlint/test/python.ini index 3c21d55b8e99..3f0e8b84a843 100644 --- a/python/mozlint/test/python.ini +++ b/python/mozlint/test/python.ini @@ -1,5 +1,6 @@ [DEFAULT] subsuite = mozlint, os == "linux" +skip-if = python == 3 [test_cli.py] [test_filterpaths.py] diff --git a/python/mozrelease/test/python.ini b/python/mozrelease/test/python.ini index 8a6e2dc5de86..7b12b171ec17 100644 --- a/python/mozrelease/test/python.ini +++ b/python/mozrelease/test/python.ini @@ -1,4 +1,5 @@ [DEFAULT] subsuite=mozrelease +skip-if = python == 3 [test_versions.py] diff --git a/python/mozversioncontrol/test/python.ini b/python/mozversioncontrol/test/python.ini index 12851bdd3072..2f38e39f51ab 100644 --- a/python/mozversioncontrol/test/python.ini +++ b/python/mozversioncontrol/test/python.ini @@ -1,4 +1,5 @@ [DEFAULT] subsuite=mozversioncontrol +skip-if = python == 3 [test_workdir_outgoing.py] diff --git a/taskcluster/taskgraph/test/python.ini b/taskcluster/taskgraph/test/python.ini index 5fac582e51cd..dba67c507817 100644 --- a/taskcluster/taskgraph/test/python.ini +++ b/taskcluster/taskgraph/test/python.ini @@ -1,5 +1,6 @@ [DEFAULT] subsuite = taskgraph +skip-if = python == 3 [test_create.py] [test_cron_util.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 index a0864a129ac1..47bbcb169362 100644 --- a/testing/marionette/harness/marionette_harness/tests/harness_unit/python.ini +++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/python.ini @@ -1,5 +1,6 @@ [DEFAULT] subsuite = marionette-harness +skip-if = python == 3 [test_httpd.py] [test_marionette_arguments.py] diff --git a/testing/mochitest/tests/python/python.ini b/testing/mochitest/tests/python/python.ini index 690ae7798387..11df150a4f67 100644 --- a/testing/mochitest/tests/python/python.ini +++ b/testing/mochitest/tests/python/python.ini @@ -1,5 +1,6 @@ [DEFAULT] subsuite = mochitest +skip-if = python == 3 [test_basic_mochitest_plain.py] sequential = true diff --git a/testing/raptor/test/python.ini b/testing/raptor/test/python.ini index 30e42703dc6b..28abaca9a4de 100644 --- a/testing/raptor/test/python.ini +++ b/testing/raptor/test/python.ini @@ -1,5 +1,6 @@ [DEFAULT] subsuite = raptor +skip-if = python == 3 [test_cmdline.py] [test_control_server.py] diff --git a/testing/talos/talos/unittests/python.ini b/testing/talos/talos/unittests/python.ini index 1a88b76feda7..1640d23218fc 100644 --- a/testing/talos/talos/unittests/python.ini +++ b/testing/talos/talos/unittests/python.ini @@ -1,5 +1,6 @@ [DEFAULT] subsuite = talos +skip-if = python == 3 [test_config.py] [test_ffsetup.py] diff --git a/testing/xpcshell/python.ini b/testing/xpcshell/python.ini index e25dd89b4c59..8ef4deeb4ea1 100644 --- a/testing/xpcshell/python.ini +++ b/testing/xpcshell/python.ini @@ -1,3 +1,3 @@ [selftest.py] # Disabled on Mac due to our builders still being on MacOS 10.7, see bug 1255588 -skip-if = os == "mac" +skip-if = os == "mac" || python == 3 diff --git a/toolkit/components/telemetry/tests/python/python.ini b/toolkit/components/telemetry/tests/python/python.ini index 743104d41856..2a9eb34382ed 100644 --- a/toolkit/components/telemetry/tests/python/python.ini +++ b/toolkit/components/telemetry/tests/python/python.ini @@ -1,3 +1,6 @@ +[DEFAULT] +skip-if = python == 3 + [test_gen_event_data_json.py] [test_gen_scalar_data_json.py] [test_histogramtools_non_strict.py] diff --git a/toolkit/crashreporter/tools/python.ini b/toolkit/crashreporter/tools/python.ini index cf92ecfbeeb1..d112168aabd6 100644 --- a/toolkit/crashreporter/tools/python.ini +++ b/toolkit/crashreporter/tools/python.ini @@ -1 +1,4 @@ +[DEFAULT] +skip-if = python == 3 + [unit-symbolstore.py] diff --git a/tools/lint/test/python.ini b/tools/lint/test/python.ini index baa74cc963de..8cd0b16693d7 100644 --- a/tools/lint/test/python.ini +++ b/tools/lint/test/python.ini @@ -1,4 +1,5 @@ [DEFAULT] subsuite=mozlint, os == "linux" +skip-if = python == 3 [test_flake8.py] diff --git a/tools/tryselect/test/python.ini b/tools/tryselect/test/python.ini index 81111012ba0e..e56d35512d02 100644 --- a/tools/tryselect/test/python.ini +++ b/tools/tryselect/test/python.ini @@ -1,5 +1,6 @@ [DEFAULT] subsuite=try +skip-if = python == 3 [test_fuzzy.py] [test_templates.py] diff --git a/xpcom/idl-parser/xpidl/python.ini b/xpcom/idl-parser/xpidl/python.ini index ee1b3c39167b..c0c0ffa24852 100644 --- a/xpcom/idl-parser/xpidl/python.ini +++ b/xpcom/idl-parser/xpidl/python.ini @@ -1 +1,4 @@ +[DEFAULT] +skip-if = python == 3 + [runtests.py] diff --git a/xpcom/typelib/xpt/tools/python.ini b/xpcom/typelib/xpt/tools/python.ini index ee1b3c39167b..c0c0ffa24852 100644 --- a/xpcom/typelib/xpt/tools/python.ini +++ b/xpcom/typelib/xpt/tools/python.ini @@ -1 +1,4 @@ +[DEFAULT] +skip-if = python == 3 + [runtests.py]