servo: Merge #11504 - Update web-platform-tests to revision bda2059150dca8ab47f088b4cc619fcdc1f262fa (from servo:wpt-20160530); r=Ms2ger
authorMs2ger <Ms2ger@gmail.com>
Mon, 30 May 2016 07:43:00 -0500
changeset 338958 829602361804c4d16e112c1d6975cb1d98c98527
parent 338957 ead48574485bf5c2a2b486faca8f82b5ec643f61
child 338959 4eeef4cbe15da562cad672bd7d2f8ae9572f90fe
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
servo: Merge #11504 - Update web-platform-tests to revision bda2059150dca8ab47f088b4cc619fcdc1f262fa (from servo:wpt-20160530); r=Ms2ger Source-Repo: https://github.com/servo/servo Source-Revision: ef265b1c0bd0ad42ef6ea8588a9c3b3782308129
servo/python/servo/testing_commands.py
--- a/servo/python/servo/testing_commands.py
+++ b/servo/python/servo/testing_commands.py
@@ -343,16 +343,21 @@ class MachCommands(CommandBase):
              category='testing',
              parser=updatecommandline.create_parser())
     @CommandArgument('--patch', action='store_true', default=False,
                      help='Create an mq patch or git commit containing the changes')
     def update_wpt(self, patch, **kwargs):
         self.ensure_bootstrapped()
         run_file = path.abspath(path.join("tests", "wpt", "update.py"))
         kwargs["no_patch"] = not patch
+
+        if kwargs["no_patch"] and kwargs["sync"]:
+            print("Are you sure you don't want a patch?")
+            return 1
+
         run_globals = {"__file__": run_file}
         execfile(run_file, run_globals)
         return run_globals["update_tests"](**kwargs)
 
     @Command('test-jquery',
              description='Run the jQuery test suite',
              category='testing')
     @CommandArgument('--release', '-r', action='store_true',
@@ -398,16 +403,21 @@ class MachCommands(CommandBase):
              category='testing',
              parser=updatecommandline.create_parser())
     @CommandArgument('--patch', action='store_true', default=False,
                      help='Create an mq patch or git commit containing the changes')
     def update_css(self, patch, **kwargs):
         self.ensure_bootstrapped()
         run_file = path.abspath(path.join("tests", "wpt", "update_css.py"))
         kwargs["no_patch"] = not patch
+
+        if kwargs["no_patch"] and kwargs["sync"]:
+            print("Are you sure you don't want a patch?")
+            return 1
+
         run_globals = {"__file__": run_file}
         execfile(run_file, run_globals)
         return run_globals["update_tests"](**kwargs)
 
     @Command('compare_dromaeo',
              description='compare outputs of two runs of ./mach test-dromaeo command',
              category='testing')
     @CommandArgument('params', default=None, nargs="...",