Bug 1483105 [wpt PR 12462] - Revert "Partly fix #8581: add extra subdomains for cookie tests", a=testonly
authorGeoffrey Sneddon <me@gsnedders.com>
Thu, 16 Aug 2018 09:36:20 +0000
changeset 431981 456c3a226bb4283deffc5b844538681d782490ec
parent 431980 322e3d3fa85ad2bda3a1fa3ad6f1dd7b71854cff
child 431982 81ce766515e4d1a18b4ff2fb87597745bd60a344
push id34456
push usertoros@mozilla.com
push dateThu, 16 Aug 2018 21:33:21 +0000
treeherdermozilla-central@72442cf86f54 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1483105, 12462, 12461
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1483105 [wpt PR 12462] - Revert "Partly fix #8581: add extra subdomains for cookie tests", a=testonly Automatic update from web-platform-testsRevert "Partly fix #8581: add extra subdomains for cookie tests" (#12462) This reverts commit ff4e72e977d0776510aea28ddfb497c7fc12e848. Fixes #12461. -- wpt-commits: 4f0b8fbd7af0d10da5082ebc862e5fb555397547 wpt-pr: 12462
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/tools/serve/serve.py
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -637728,17 +637728,17 @@
    "40da7e9fd398b27000e96b8b2a67199025e02611",
    "support"
   ],
   "tools/serve/commands.json": [
    "abcb2970b63f48f2e817d2b5ff8f085e02df7588",
    "support"
   ],
   "tools/serve/serve.py": [
-   "6e977066af701a4c5dfc173187110b0e01a03e7e",
+   "30791eb967b36ac9a3c85070b232b4459723ef2d",
    "support"
   ],
   "tools/serve/test_serve.py": [
    "e939c3a0ccee4ac4f5babbcab3b9d30dbfa80be8",
    "support"
   ],
   "tools/third_party/atomicwrites/.gitignore": [
    "2b2d3128753e9f6f34895e7183595829d1063a5a",
--- a/testing/web-platform/tests/tools/serve/serve.py
+++ b/testing/web-platform/tests/tools/serve/serve.py
@@ -11,17 +11,16 @@ import platform
 import socket
 import sys
 import threading
 import time
 import traceback
 from six.moves import urllib
 import uuid
 from collections import defaultdict, OrderedDict
-from itertools import chain, product
 from multiprocessing import Process, Event
 
 from localpaths import repo_root
 from six.moves import reload_module
 
 from manifest.sourcefile import read_script_metadata, js_meta_re, parse_variants
 from wptserve import server as wptserve, handlers
 from wptserve import stash
@@ -699,31 +698,24 @@ def build_config(override_path=None, **k
             continue
         value = os.path.abspath(os.path.expanduser(value))
         if not os.path.exists(value):
             raise ValueError("%s path %s does not exist" % (title, value))
         setattr(rv, key, value)
 
     return rv
 
-def _make_subdomains_product(s, depth=3):
-    return set(u".".join(x) for x in chain(*(product(s, repeat=i) for i in range(1, depth+1))))
-
 _subdomains = {u"www",
                u"www1",
                u"www2",
                u"天気の良い日",
                u"élève"}
 
 _not_subdomains = {u"nonexistent"}
 
-_subdomains = _make_subdomains_product(_subdomains)
-
-_not_subdomains = _make_subdomains_product(_not_subdomains)
-
 
 class ConfigBuilder(config.ConfigBuilder):
     """serve config
 
     this subclasses wptserve.config.ConfigBuilder to add serve config options"""
 
     _default = {
         "browser_host": "web-platform.test",