From f78dc9f613ec8788c894343955bfd376e260bb41 Mon Sep 17 00:00:00 2001
From: Austin Hicks <camlorn@camlorn.net>
Date: Mon, 19 Jun 2017 21:15:20 -0400
Subject: [PATCH] Minimal changes to get WPT tests running on Windows.

---
 tests/wpt/grouping_formatter.py               | 7 ++++++-
 tests/wpt/harness/wptrunner/wptcommandline.py | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/wpt/grouping_formatter.py b/tests/wpt/grouping_formatter.py
index 5bca29eec62..a02714b7068 100644
--- a/tests/wpt/grouping_formatter.py
+++ b/tests/wpt/grouping_formatter.py
@@ -7,6 +7,7 @@ import collections
 import os
 import sys
 import subprocess
+import platform
 
 DEFAULT_MOVE_UP_CODE = u"\x1b[A"
 DEFAULT_CLEAR_EOL_CODE = u"\x1b[K"
@@ -29,8 +30,12 @@ class GroupingFormatter(base.BaseFormatter):
 
         # TODO(mrobinson, 8313): We need to add support for Windows terminals here.
         if self.interactive:
-            self.line_width = int(subprocess.check_output(['stty', 'size']).split()[1])
             self.move_up, self.clear_eol = self.get_move_up_and_clear_eol_codes()
+            if platform.system() != "Windows":
+                self.line_width = int(subprocess.check_output(['stty', 'size']).split()[1])
+            else:
+                # Until we figure out proper Windows support, this makes things work well enough to run.
+                self.line_width = 80
 
         self.expected = {
             'OK': 0,
diff --git a/tests/wpt/harness/wptrunner/wptcommandline.py b/tests/wpt/harness/wptrunner/wptcommandline.py
index 38e7b8f5363..d7dd0534729 100644
--- a/tests/wpt/harness/wptrunner/wptcommandline.py
+++ b/tests/wpt/harness/wptrunner/wptcommandline.py
@@ -256,8 +256,10 @@ def exe_path(name):
         return
 
     path = find_executable(name)
-    if os.access(path, os.X_OK):
+    if path and os.access(path, os.X_OK):
         return path
+    else:
+        return None
 
 
 def check_args(kwargs):