Fix webkitpy tests after r190922.

* Scripts/webkitpy/common/config/ews.json:
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
* Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190924 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d4c4590..02e54c8 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,13 @@
 2015-10-12  Alexey Proskuryakov  <ap@apple.com>
 
+        Fix webkitpy tests after r190922.
+
+        * Scripts/webkitpy/common/config/ews.json:
+        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+
+2015-10-12  Alexey Proskuryakov  <ap@apple.com>
+
         Add a Mac debug EWS queue
         https://bugs.webkit.org/show_bug.cgi?id=150069
 

diff --git a/Tools/Scripts/webkitpy/common/config/ews.json b/Tools/Scripts/webkitpy/common/config/ews.json
index cbc4006..250eab2 100644 (file)
--- a/Tools/Scripts/webkitpy/common/config/ews.json
+++ b/Tools/Scripts/webkitpy/common/config/ews.json
@@ -39,6 +39,6 @@
         "port": "mac",
         "name": "mac-debug-32bit-ews",
         "style": "debug",
-        "architecture": "i386",
+        "architecture": "i386"
     }
 }

diff --git a/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py b/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
index 4f9b6f3..9ad73e7 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
+++ b/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
@@ -123,7 +123,7 @@ class AbstractEarlyWarningSystem(AbstractReviewQueue, EarlyWarningSystemTaskDele
         return self._layout_test_results_reader.archive(patch)
 
     def build_style(self):
-        return self.build_style
+        return self._build_style
 
     def refetch_patch(self, patch):
         return self._tool.bugs.fetch_attachment(patch.id())
@@ -149,11 +149,11 @@ class AbstractEarlyWarningSystem(AbstractReviewQueue, EarlyWarningSystemTaskDele
 
         classes = []
         for name, config in ewses.iteritems():
-            classes.append(type(str(name).translate(None, ' -'), (AbstractEarlyWarningSystem,), {
+            classes.append(type(name.encode('utf-8').translate(None, ' -'), (AbstractEarlyWarningSystem,), {
                 'name': config.get('name', config['port'] + '-ews'),
                 'port_name': config['port'],
                 'architecture': config.get('architecture', None),
-                'build_style': config.get('style', "release"),
+                '_build_style': config.get('style', "release"),
                 'watchers': config.get('watchers', []),
                 'run_tests': config.get('runTests', cls.run_tests),
             }))

diff --git a/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py b/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
index a9e2b4a..e93fde3 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
@@ -64,6 +64,7 @@ class EarlyWarningSystemTest(QueuesTest):
             "name": ews.name,
             "port": ews.port_name,
             "architecture": " --architecture=%s" % ews.architecture if ews.architecture else "",
+            "build_style": ews.build_style(),
         }
         if ews.run_tests:
             run_tests_line = "Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --port=%(port)s%(architecture)s\n" % string_replacements
@@ -76,7 +77,7 @@ class EarlyWarningSystemTest(QueuesTest):
             "process_work_item": """Running: webkit-patch --status-host=example.com clean --port=%(port)s%(architecture)s
 Running: webkit-patch --status-host=example.com update --port=%(port)s%(architecture)s
 Running: webkit-patch --status-host=example.com apply-attachment --no-update --non-interactive 10000 --port=%(port)s%(architecture)s
-Running: webkit-patch --status-host=example.com build --no-clean --no-update --build-style=release --port=%(port)s%(architecture)s
+Running: webkit-patch --status-host=example.com build --no-clean --no-update --build-style=%(build_style)s --port=%(port)s%(architecture)s
 %(run_tests_line)sMOCK: update_status: %(name)s Pass
 MOCK: release_work_item: %(name)s 10000
 """ % string_replacements,