mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1714641: Remove usages of vendored "wptserve_py2" library r=jgraham,ahal 

We should only be using the Python3 "wptserve" library at this point.

Differential Revision: https://phabricator.services.mozilla.com/D117062
This commit is contained in:
Mitchell Hentges 2021-06-09 15:48:51 +00:00
Родитель eca9f5e421
Коммит 70806e17b5
6 изменённых файлов: 32 добавлений и 149 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
.flake8
Просмотреть файл

@ -72,7 +72,6 @@ exclude =
testing/marionette/harness/marionette_harness/tests,
testing/mochitest/pywebsocket3,
testing/mozharness/configs/test/test_malformed.py,
testing/web-platform/mozilla/tests/tools/wptserve_py2,
testing/web-platform/tests,
tools/lint/test/files,
tools/infer/test/*.configure,

172
python/mozbuild/mozbuild/action/test_archive.py
Просмотреть файл

@ -53,10 +53,7 @@ TEST_HARNESS_BINS = [
TEST_HARNESS_DLLS = ["crashinjectdll", "mozglue"]
GMP_TEST_PLUGIN_DIRS = [
"gmp-fake/**",
"gmp-fakeopenh264/**",
]
GMP_TEST_PLUGIN_DIRS = ["gmp-fake/**", "gmp-fakeopenh264/**"]
# These entries will be used by artifact builds to re-construct an
# objdir with the appropriate generated support files.
@ -100,47 +97,30 @@ ARCHIVE_FILES = {
"fuzztest/**",
],
},
{
"source": buildconfig.topobjdir,
"base": "_tests",
"pattern": "modules/**",
},
{"source": buildconfig.topobjdir, "base": "_tests", "pattern": "modules/**"},
{
"source": buildconfig.topsrcdir,
"base": "testing/marionette",
"patterns": [
"client/**",
"harness/**",
"mach_test_package_commands.py",
],
"patterns": ["client/**", "harness/**", "mach_test_package_commands.py"],
"dest": "marionette",
"ignore": [
"client/docs",
"harness/marionette_harness/tests",
],
"ignore": ["client/docs", "harness/marionette_harness/tests"],
},
{
"source": buildconfig.topsrcdir,
"base": "",
"manifests": [
"testing/marionette/harness/marionette_harness/tests/unit-tests.ini",
"testing/marionette/harness/marionette_harness/tests/unit-tests.ini"
],
# We also need the manifests and harness_unit tests
"pattern": "testing/marionette/harness/marionette_harness/tests/**",
"dest": "marionette/tests",
},
{
"source": buildconfig.topobjdir,
"base": "_tests",
"pattern": "mozbase/**",
},
{"source": buildconfig.topobjdir, "base": "_tests", "pattern": "mozbase/**"},
{
"source": buildconfig.topsrcdir,
"base": "testing",
"pattern": "firefox-ui/**",
"ignore": [
"firefox-ui/tests",
],
"ignore": ["firefox-ui/tests"],
},
{
"source": buildconfig.topsrcdir,
@ -154,11 +134,7 @@ ARCHIVE_FILES = {
"pattern": "/**",
"dest": "telemetry/marionette",
},
{
"source": buildconfig.topsrcdir,
"base": "testing",
"pattern": "tps/**",
},
{"source": buildconfig.topsrcdir, "base": "testing", "pattern": "tps/**"},
{
"source": buildconfig.topsrcdir,
"base": "services/sync/",
@ -170,12 +146,6 @@ ARCHIVE_FILES = {
"pattern": "**",
"dest": "tps/tests",
},
{
"source": buildconfig.topsrcdir,
"base": "testing/web-platform/mozilla/tests/tools/wptserve_py2",
"pattern": "**",
"dest": "tools/wptserve_py2",
},
{
"source": buildconfig.topsrcdir,
"base": "testing/web-platform/tests/tools/wptserve",
@ -206,11 +176,7 @@ ARCHIVE_FILES = {
"pattern": "**",
"dest": "tools/distro",
},
{
"source": buildconfig.topobjdir,
"base": "",
"pattern": "mozinfo.json",
},
{"source": buildconfig.topobjdir, "base": "", "pattern": "mozinfo.json"},
{
"source": buildconfig.topobjdir,
"base": "dist/bin",
@ -238,18 +204,13 @@ ARCHIVE_FILES = {
{
"source": buildconfig.topobjdir,
"base": "dist/bin",
"patterns": [
"dmd.py",
"fix_stacks.py",
],
"patterns": ["dmd.py", "fix_stacks.py"],
"dest": "bin",
},
{
"source": buildconfig.topobjdir,
"base": "dist/bin/components",
"patterns": [
"httpd.js",
],
"patterns": ["httpd.js"],
"dest": "bin/components",
},
{
@ -260,11 +221,7 @@ ARCHIVE_FILES = {
},
],
"cppunittest": [
{
"source": STAGE,
"base": "",
"pattern": "cppunittest/**",
},
{"source": STAGE, "base": "", "pattern": "cppunittest/**"},
# We don't ship these files if startup cache is disabled, which is
# rare. But it shouldn't matter for test archives.
{
@ -298,13 +255,7 @@ ARCHIVE_FILES = {
"dest": "cppunittest",
},
],
"gtest": [
{
"source": STAGE,
"base": "",
"pattern": "gtest/**",
},
],
"gtest": [{"source": STAGE, "base": "", "pattern": "gtest/**"}],
"mochitest": [
OBJDIR_TEST_FILES["mochitest"],
{
@ -312,11 +263,7 @@ ARCHIVE_FILES = {
"base": "_tests/testing",
"pattern": "mochitest/**",
},
{
"source": STAGE,
"base": "",
"pattern": "mochitest/**",
},
{"source": STAGE, "base": "", "pattern": "mochitest/**"},
{
"source": buildconfig.topobjdir,
"base": "",
@ -379,11 +326,7 @@ ARCHIVE_FILES = {
},
],
"reftest": [
{
"source": buildconfig.topobjdir,
"base": "_tests",
"pattern": "reftest/**",
},
{"source": buildconfig.topobjdir, "base": "_tests", "pattern": "reftest/**"},
{
"source": buildconfig.topobjdir,
"base": "",
@ -414,11 +357,7 @@ ARCHIVE_FILES = {
},
],
"talos": [
{
"source": buildconfig.topsrcdir,
"base": "testing",
"pattern": "talos/**",
},
{"source": buildconfig.topsrcdir, "base": "testing", "pattern": "talos/**"},
{
"source": buildconfig.topsrcdir,
"base": "testing/profiles",
@ -433,22 +372,10 @@ ARCHIVE_FILES = {
},
],
"perftests": [
{
"source": buildconfig.topsrcdir,
"pattern": "testing/mozbase/**",
},
{
"source": buildconfig.topsrcdir,
"pattern": "testing/condprofile/**",
},
{
"source": buildconfig.topsrcdir,
"pattern": "third_party/python/**",
},
{
"source": buildconfig.topsrcdir,
"pattern": "tools/lint/eslint/**",
},
{"source": buildconfig.topsrcdir, "pattern": "testing/mozbase/**"},
{"source": buildconfig.topsrcdir, "pattern": "testing/condprofile/**"},
{"source": buildconfig.topsrcdir, "pattern": "third_party/python/**"},
{"source": buildconfig.topsrcdir, "pattern": "tools/lint/eslint/**"},
{"source": buildconfig.topsrcdir, "pattern": "**/perftest_*.js"},
{"source": buildconfig.topsrcdir, "pattern": "**/hooks_*py"},
{"source": buildconfig.topsrcdir, "pattern": "build/autoconf/**"},
@ -542,11 +469,7 @@ ARCHIVE_FILES = {
},
],
"raptor": [
{
"source": buildconfig.topsrcdir,
"base": "testing",
"pattern": "raptor/**",
},
{"source": buildconfig.topsrcdir, "base": "testing", "pattern": "raptor/**"},
{
"source": buildconfig.topsrcdir,
"base": "testing/profiles",
@ -561,11 +484,7 @@ ARCHIVE_FILES = {
},
],
"awsy": [
{
"source": buildconfig.topsrcdir,
"base": "testing",
"pattern": "awsy/**",
},
{"source": buildconfig.topsrcdir, "base": "testing", "pattern": "awsy/**"}
],
"web-platform": [
{
@ -582,9 +501,7 @@ ARCHIVE_FILES = {
"source": buildconfig.topsrcdir,
"base": "testing",
"pattern": "web-platform/tests/**",
"ignore": [
"web-platform/tests/tools/wpt_third_party",
],
"ignore": ["web-platform/tests/tools/wpt_third_party"],
},
{
"source": buildconfig.topobjdir,
@ -618,11 +535,7 @@ ARCHIVE_FILES = {
],
"dest": "xpcshell",
},
{
"source": STAGE,
"base": "",
"pattern": "xpcshell/**",
},
{"source": STAGE, "base": "", "pattern": "xpcshell/**"},
{
"source": buildconfig.topobjdir,
"base": "",
@ -669,18 +582,9 @@ ARCHIVE_FILES = {
"dest": "updater-dep",
},
],
"jsreftest": [
{
"source": STAGE,
"base": "",
"pattern": "jsreftest/**",
},
],
"jsreftest": [{"source": STAGE, "base": "", "pattern": "jsreftest/**"}],
"fuzztest": [
{
"source": buildconfig.topsrcdir,
"pattern": "tools/fuzzing/smoke/**",
},
{"source": buildconfig.topsrcdir, "pattern": "tools/fuzzing/smoke/**"}
],
"jittest": [
{
@ -727,10 +631,7 @@ if buildconfig.substs.get("MOZ_CODE_COVERAGE"):
{
"source": buildconfig.topsrcdir,
"base": "python/mozbuild/",
"patterns": [
"mozpack/**",
"mozbuild/codecoverage/**",
],
"patterns": ["mozpack/**", "mozbuild/codecoverage/**"],
}
)
@ -822,11 +723,7 @@ def find_files(archive):
if patterns:
entry["patterns"] = patterns
extra_entries.append(entry)
entry = {
"source": buildconfig.topobjdir,
"base": "_tests",
"patterns": [],
}
entry = {"source": buildconfig.topobjdir, "base": "_tests", "patterns": []}
for path in set(generated_harness_files) - packaged_paths:
entry["patterns"].append(path[len("_tests") + 1 :])
extra_entries.append(entry)
@ -850,13 +747,7 @@ def find_files(archive):
patterns.extend({"{}/**".format(d) for d in dirs})
ignore = list(entry.get("ignore", []))
ignore.extend(
[
"**/.flake8",
"**/.mkdir.done",
"**/*.pyc",
]
)
ignore.extend(["**/.flake8", "**/.mkdir.done", "**/*.pyc"])
if archive not in ("common", "updater-dep") and base.startswith("_tests"):
# We may have generated_harness_files to exclude from this entry.
@ -864,10 +755,7 @@ def find_files(archive):
if path.startswith(base):
ignore.append(path[len(base) + 1 :])
common_kwargs = {
"find_dotfiles": True,
"ignore": ignore,
}
common_kwargs = {"find_dotfiles": True, "ignore": ignore}
finder = FileFinder(os.path.join(source, base), **common_kwargs)

3
testing/config/marionette_requirements.txt
Просмотреть файл

@ -1,7 +1,6 @@
-r mozbase_requirements.txt
../tools/wptserve_py2 ; python_version < '3'
../tools/wptserve ; python_version >= '3'
../tools/wptserve
../tools/wpt_third_party/certifi
../tools/wpt_third_party/enum ; python_version < '3'
../tools/wpt_third_party/h2

3
testing/config/marionette_source_requirements.txt
Просмотреть файл

@ -2,8 +2,7 @@
-r mozbase_source_requirements.txt
../web-platform/tests/tools/wptserve ; python_version >= '3'
../web-platform/mozilla/tests/tools/wptserve_py2 ; python_version < '3'
../web-platform/tests/tools/wptserve
../web-platform/tests/tools/third_party/certifi
../web-platform/tests/tools/third_party/enum ; python_version < '3'
../web-platform/tests/tools/third_party/h2

1
tools/lint/black.yml
Просмотреть файл

@ -7,7 +7,6 @@ black:
- python/mozbuild/mozbuild/fork_interpose.py
- python/mozbuild/mozbuild/test/frontend/data/reader-error-syntax/moz.build
- testing/mozharness/configs/test/test_malformed.py
- testing/web-platform/mozilla/tests/tools/wptserve_py2
- testing/web-platform/tests
extensions:
- build

1
tools/lint/file-whitespace.yml
Просмотреть файл

@ -165,7 +165,6 @@ file-whitespace:
- testing/web-platform/tests/tools/wptrunner/wptrunner/tests/test_update.py
- testing/web-platform/tests/tools/lint/tests/dummy/broken.html
- testing/web-platform/tests/tools/lint/tests/dummy/broken_ignored.html
- testing/web-platform/mozilla/tests/tools/wptserve_py2
- toolkit/components/telemetry/build_scripts/setup.py
- toolkit/components/telemetry/tests/marionette/mach_commands.py
- toolkit/content/tests/chrome