Bug 1547730 - Set python test annotations to correspond to currently-…

…passing py3 tests r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D28122

python/moz.build

@@ -66,5 +66,7 @@ PYTHON_UNITTEST_MANIFESTS += [
 if CONFIG['MOZ_BUILD_APP']:
     PYTHON_UNITTEST_MANIFESTS += [
         'mozbuild/mozbuild/test/python.ini',
+        'mozbuild/mozbuild/test/python2.ini',
         'mozbuild/mozpack/test/python.ini',
+        'mozbuild/mozpack/test/python2.ini',
     ]

python/mozbuild/mozbuild/test/python.ini

@@ -1,52 +1,5 @@
 [DEFAULT]
-skip-if = python == 3
 
-[action/test_buildlist.py]
-[action/test_langpack_manifest.py]
-[action/test_node.py]
-[action/test_process_install_manifest.py]
-[action/test_package_fennec_apk.py]
-[analyze/test_graph.py]
-skip-if = (os == "win")
-[backend/test_build.py]
-[backend/test_configenvironment.py]
-[backend/test_fastermake.py]
-[backend/test_gn_processor.py]
-[backend/test_partialconfigenvironment.py]
-[backend/test_recursivemake.py]
-[backend/test_test_manifest.py]
-[backend/test_visualstudio.py]
-[codecoverage/test_lcov_rewrite.py]
-[compilation/test_warnings.py]
-[configure/lint.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]
-[test_artifact_cache.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_mozconfig.py]
-[test_mozinfo.py]
-[test_preprocessor.py]
 [test_pythonutil.py]
-[test_util.py]

python/mozbuild/mozbuild/test/python2.ini

@@ -0,0 +1,49 @@
+[DEFAULT]
+skip-if = python == 3
+
+[action/test_buildlist.py]
+[action/test_langpack_manifest.py]
+[action/test_node.py]
+[action/test_process_install_manifest.py]
+[action/test_package_fennec_apk.py]
+[analyze/test_graph.py]
+skip-if = (os == "win")
+[backend/test_build.py]
+[backend/test_configenvironment.py]
+[backend/test_fastermake.py]
+[backend/test_gn_processor.py]
+[backend/test_partialconfigenvironment.py]
+[backend/test_recursivemake.py]
+[backend/test_test_manifest.py]
+[backend/test_visualstudio.py]
+[codecoverage/test_lcov_rewrite.py]
+[compilation/test_warnings.py]
+[configure/lint.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]
+[test_artifact_cache.py]
+[test_base.py]
+[test_containers.py]
+[test_dotproperties.py]
+[test_jarmaker.py]
+[test_line_endings.py]
+[test_makeutil.py]
+[test_mozconfig.py]
+[test_mozinfo.py]
+[test_preprocessor.py]
+[test_util.py]

python/mozbuild/mozpack/test/python.ini

@@ -2,13 +2,5 @@
 
 [test_chrome_flags.py]
 [test_chrome_manifest.py]
-[test_copier.py]
-[test_errors.py]
-[test_files.py]
-[test_manifests.py]
 [test_mozjar.py]
-[test_packager.py]
-[test_packager_formats.py]
-[test_packager_l10n.py]
-[test_packager_unpack.py]
 [test_path.py]

python/mozbuild/mozpack/test/python2.ini

@@ -0,0 +1,11 @@
+[DEFAULT]
+skip-if = python == 3
+
+[test_copier.py]
+[test_errors.py]
+[test_files.py]
+[test_manifests.py]
+[test_packager.py]
+[test_packager_formats.py]
+[test_packager_l10n.py]
+[test_packager_unpack.py]