[mq]: trash
authorJoel Maher <jmaher@mozilla.com>
Thu, 17 May 2018 08:11:17 -0400
changeset 1514353 6d589ac0354a02d48342304a47d262b5e256665d
parent 1514240 fb27943d7f3254b5a2760322a74d0dc53d6e685f
child 1514354 b3de7e172a2eba8a861fa4e9dcc368cf93772100
push id272242
push userjmaher@mozilla.com
push dateThu, 17 May 2018 12:12:33 +0000
treeherdertry@b3de7e172a2e [default view] [failures only]
milestone62.0a1
[mq]: trash
package-lock.json
taskcluster/taskgraph/transforms/tests.py
testing/mozharness/scripts/desktop_unittest.py
testing/web-platform/tests/2dcontext/text-styles/2d.text.align.default.html
tools/tryselect/selectors/fuzzy.py
try_task_config.json
--- a/package-lock.json
+++ b/package-lock.json
@@ -175,17 +175,17 @@
     "chardet": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
       "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
     },
     "circular-json": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY="
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
     },
     "cli-cursor": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "requires": {
         "restore-cursor": "2.0.0"
       }
@@ -269,17 +269,17 @@
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
         "rimraf": "2.6.2"
       }
     },
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "requires": {
         "esutils": "2.0.2"
       }
     },
     "dom-serializer": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
@@ -859,17 +859,17 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "requires": {
         "pinkie": "2.0.4"
       }
     },
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c="
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
     },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "process-nextick-args": {
       "version": "2.0.0",
@@ -926,17 +926,17 @@
       "requires": {
         "onetime": "2.0.1",
         "signal-exit": "3.0.2"
       }
     },
     "rimraf": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "requires": {
         "glob": "7.1.2"
       }
     },
     "run-async": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
@@ -970,17 +970,17 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs="
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "requires": {
         "shebang-regex": "1.0.0"
       }
@@ -1071,17 +1071,17 @@
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "requires": {
         "os-tmpdir": "1.0.2"
       }
     },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
@@ -1097,17 +1097,17 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "which": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "requires": {
         "isexe": "2.0.0"
       }
     },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -786,16 +786,17 @@ def split_e10s(config, tests):
 
 @transforms.add
 def split_chunks(config, tests):
     """Based on the 'chunks' key, split tests up into chunks by duplicating
     them and assigning 'this-chunk' appropriately and updating the treeherder
     symbol."""
     for test in tests:
         if test['suite'].startswith('test-verify'):
+            print("JMAHER: splitting chunks: %s" % test['suite'])
             test['chunks'] = perfile_number_of_chunks(config, test['test-name'])
             if test['chunks'] == 0:
                 continue
             # limit the number of chunks we run for test-verify mode because
             # test-verify is comprehensive and takes a lot of time, if we have
             # >30 tests changed, this is probably an import of external tests,
             # or a patch renaming/moving files in bulk
             maximum_number_verify_chunks = 3
@@ -844,37 +845,41 @@ def perfile_number_of_chunks(config, typ
 
     changed_files = None
     if config.params.get('try_task_config', None):
         task_config = config.params.get('try_task_config', None)
         if 'templates' in task_config.keys() and \
            'env' in task_config['templates'].keys():
             changed_files = task_config['templates']['env'].get('MOZHARNESS_TEST_PATHS', None)
             if changed_files:
+                print("JMAHER: got mh test paths")
                 changed_files = changed_files.split(":")
 
     if not changed_files:
         changed_files = files_changed.get_changed_files(config.params.get('head_repository'),
                                                         config.params.get('head_rev'))
+
+    print("JMAHER: changed_files: %s" % changed_files)
     test_count = 0
     for pattern in file_patterns:
         for path in changed_files:
             if mozpackmatch(path, pattern):
                 gpu = False
                 if type == 'test-verify-e10s':
                     # file_patterns for test-verify will pick up some gpu tests, lets ignore
                     # in the case of reftest, we will not have any in the regular case
                     gpu_dirs = ['dom/canvas', 'gfx/tests', 'devtools/canvasdebugger', 'webgl']
                     for gdir in gpu_dirs:
                         if len(path.split(gdir)) > 1:
                             gpu = True
 
                 if not gpu:
                     test_count += 1
 
+    print("JMAHER: test_count: %s" % test_count)
     chunks = test_count/tests_per_chunk
     return int(math.ceil(chunks))
 
 
 @transforms.add
 def allow_software_gl_layers(config, tests):
     """
     Handle the "allow-software-gl-layers" property for platforms where it
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -405,20 +405,20 @@ class DesktopUnittest(TestingMixin, Merc
             if suite_category not in SUITE_NO_E10S:
                 if suite_category in SUITE_DEFAULT_E10S and not c['e10s']:
                     base_cmd.append('--disable-e10s')
                 elif suite_category not in SUITE_DEFAULT_E10S and c['e10s']:
                     base_cmd.append('--e10s')
 
             # Ignore chunking if we have user specified test paths
             if os.environ.get('MOZHARNESS_TEST_PATHS') and \
-                              not (self.verify_enabled or self.per_test_coverage):
+                 not (self.verify_enabled or self.per_test_coverage):
                 base_cmd.extend(os.environ['MOZHARNESS_TEST_PATHS'].split(':'))
             elif c.get('total_chunks') and c.get('this_chunk') and \
-                not (self.verify_enabled or self.per_test_coverage):
+                 not (self.verify_enabled or self.per_test_coverage):
                 base_cmd.extend(['--total-chunks', c['total_chunks'],
                                  '--this-chunk', c['this_chunk']])
 
             if c['no_random']:
                 if suite_category == "mochitest":
                     base_cmd.append('--bisect-chunk=default')
                 else:
                     self.warning("--no-random does not currently work with suites other than "
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.default.html
+++ b/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.default.html
@@ -6,17 +6,17 @@
 <script src="/common/canvas-tests.js"></script>
 <link rel="stylesheet" href="/common/canvas-tests.css">
 <body class="show_output">
 
 <h1>2d.text.align.default</h1>
 <p class="desc"></p>
 
 
-<p class="output">Actual output:</p>
+<p class="output">Actual output: </p>
 <canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 
 <ul id="d"></ul>
 <script>
 var t = async_test("");
 _addTest(function(canvas, ctx) {
 
 _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
--- a/tools/tryselect/selectors/fuzzy.py
+++ b/tools/tryselect/selectors/fuzzy.py
@@ -171,31 +171,39 @@ def format_header():
         shortcuts.append('{t.white}{action}{t.normal}: {t.yellow}<{key}>{t.normal}'.format(
                          t=terminal, action=action, key=key))
     return FZF_HEADER.format(shortcuts=', '.join(shortcuts), t=terminal)
 
 
 def filter_by_paths(tasks, paths):
     resolver = TestResolver.from_environment(cwd=here)
     run_suites, run_tests = resolver.resolve_metadata(paths)
+    print("JMAHER: paths: %s" % paths)
+    print("JMAHER: run_tests: %s" % run_tests)
     flavors = set([(t['flavor'], t.get('subsuite')) for t in run_tests])
+    print("JMAHER: flavors: %s" % flavors)
 
     task_regexes = set()
     for flavor, subsuite in flavors:
         suite = get_suite_definition(flavor, subsuite, strict=True)
         if 'task_regex' not in suite:
             print("warning: no tasks could be resolved from flavor '{}'{}".format(
                     flavor, " and subsuite '{}'".format(subsuite) if subsuite else ""))
             continue
 
         task_regexes.add(suite['task_regex'])
     task_regexes.add('test-verify(?:-e10s)?(?:-[0-9])?$')
+    task_regexes.add('test-verify-gpu(?:-e10s)?(?:-[0-9])?$')
+    task_regexes.add('test-verify-wpt-e10s(?:-[0-9])?$')
 
     def match_task(task):
-        return any(re.search(pattern, task) for pattern in task_regexes)
+        matched = any(re.search(pattern, task) for pattern in task_regexes)
+        if matched:
+            print(task)
+        return matched
 
     return filter(match_task, tasks)
 
 
 def run_fuzzy_try(update=False, query=None, templates=None, full=False, parameters=None,
                   save=False, preset=None, mod_presets=False, push=True, message='{msg}',
                   paths=None, **kwargs):
     if mod_presets:
new file mode 100644
--- /dev/null
+++ b/try_task_config.json
@@ -0,0 +1,17 @@
+{
+  "templates":{
+    "env":{
+      "MOZHARNESS_TEST_PATHS":"testing/web-platform/mozilla/tests/dom/throttling/throttling-1.window.js"
+    },
+    "artifact":{
+      "enabled":"1"
+    }
+  },
+  "tasks":[
+    "test-linux64/opt-test-verify-e10s-1",
+    "test-linux64/opt-test-verify-e10s-2",
+    "test-linux64/opt-test-verify-wpt-e10s-1",
+    "test-linux64/opt-test-verify-wpt-e10s-2",
+    "test-linux64/opt-test-verify-wpt-e10s-3"
+  ]
+}