Upgrade wptrunner to dd8ba1a0710c476ec4f56f78db87f634762085ee.

servo · jdm · Jul 4, 2016 · Jul 4, 2016 · Jul 4, 2016 · Jul 4, 2016
commit c82f9e6c4cec73d8945110be2450c854242eff80
diff --git a/tests/wpt/harness/requirements.txt b/tests/wpt/harness/requirements.txt
@@ -2,4 +2,3 @@ html5lib >= 0.99
 mozinfo >= 0.7
 mozlog >= 3.0
 mozdebug >= 0.1
-pytest >= 2.9
diff --git a/tests/wpt/harness/requirements_servo.txt b/tests/wpt/harness/requirements_servo.txt
@@ -1,2 +1 @@
 mozprocess >= 0.19
-pytest >= 2.9
diff --git a/tests/wpt/harness/wptrunner/executors/executorservo.py b/tests/wpt/harness/wptrunner/executors/executorservo.py
@@ -224,10 +224,7 @@ def screenshot(self, test, viewport_size, dpi):
             for pref in test.environment.get('prefs', {}):
                 command += ["--pref", pref]
 
-            if viewport_size:
-                command += ["--resolution", viewport_size]
-            else:
-                command += ["--resolution", "800x600"]
+            command += ["--resolution", viewport_size or "800x600"]
 
             if dpi:
                 command += ["--device-pixel-ratio", dpi]

diff --git a/tests/wpt/harness/wptrunner/testharnessreport-servo.js b/tests/wpt/harness/wptrunner/testharnessreport-servo.js
@@ -8,7 +8,7 @@ setup(props);
 
 add_completion_callback(function (tests, harness_status) {
     var id = location.pathname + location.search + location.hash;
-    alert("RESULT: " + JSON.stringify([
+    console.log("ALERT RESULT: " + JSON.stringify([
         id,
         harness_status.status,
         harness_status.message,