Merge r227198 - WebDriver: driver environment not passed to pytest wh…

…en running w3c tests

https://bugs.webkit.org/show_bug.cgi?id=181852

Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2018-01-19
Reviewed by Carlos Alberto Lopez Perez.

That's why color codes are not used in the bots log for selenium tests but they appear in w3c tests.

* Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py:
(WebDriverW3CExecutor.run):

Tools/ChangeLog

@@ -1,3 +1,15 @@
+2018-01-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: driver environment not passed to pytest when running w3c tests
+        https://bugs.webkit.org/show_bug.cgi?id=181852
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        That's why color codes are not used in the bots log for selenium tests but they appear in w3c tests.
+
+        * Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py:
+        (WebDriverW3CExecutor.run):
+
 2018-01-19  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         WebDriver: run-webdriver-tests is crashing in the bots when creating results json file

Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py

@@ -150,5 +150,6 @@ def run(self, test, timeout, expectations):
                'WD_PORT': str(self.protocol.session_config['port']),
                'WD_CAPABILITIES': json.dumps(self.protocol.session_config['capabilities']),
                'WD_SERVER_CONFIG': json.dumps(self.server_config)}
+        env.update(WebKitDriverServer.test_env)
         args = ['--strict', '-p', 'no:mozlog']
         return pytest_runner.run(test, args, timeout, env, expectations)