Attachment 343204 Details for Bug 186872 – Proposed patch

[patch] Proposed patch

ews_unittest_dir.patch (text/plain), 2.59 KB, created by Aakash Jain on 2018-06-20 19:54:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2018-06-20 19:54:39 PDT

Size: 2.59 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 233028)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2018-06-20  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] unit-tests fail when run from another directory
>+        https://bugs.webkit.org/show_bug.cgi?id=186872
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/ews-build/loadConfig.py:
>+        (loadBuilderConfig): Add support for passing master_prefix_path.
>+        * BuildSlaveSupport/ews-build/loadConfig_unittest.py:
>+        (ConfigDotJSONTest.test_configuration): Set master_prefix_path as current directory.
>+
> 2018-06-20  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [WebKit on watchOS] Fixed position elements sometimes flicker when scrolling
>Index: Tools/BuildSlaveSupport/ews-build/loadConfig.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/loadConfig.py	(revision 233028)
>+++ Tools/BuildSlaveSupport/ews-build/loadConfig.py	(working copy)
>@@ -22,6 +22,7 @@
> 
> 
> import json
>+import os
> import re
> 
> from buildbot.scheduler import AnyBranchScheduler, Periodic, Dependent, Triggerable, Nightly
>@@ -34,9 +35,9 @@ BUILDER_NAME_LENGTH_LIMIT = 70
> STEP_NAME_LENGTH_LIMIT = 50
> 
> 
>-def loadBuilderConfig(c):
>-    config = json.load(open('config.json'))
>-    passwords = json.load(open('passwords.json'))
>+def loadBuilderConfig(c, use_localhost_worker=False, master_prefix_path='./'):
>+    config = json.load(open(os.path.join(master_prefix_path, 'config.json')))
>+    passwords = json.load(open(os.path.join(master_prefix_path, 'passwords.json')))
>     checkWorkersAndBuildersForConsistency(config['workers'], config['builders'])
> 
>     c['workers'] = [Worker(worker['name'], passwords.get(worker['name'], 'password')) for worker in config['workers']]
>Index: Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py	(revision 233028)
>+++ Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py	(working copy)
>@@ -23,6 +23,7 @@
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> 
>+import os
> import unittest
> 
> import loadConfig
>@@ -30,7 +31,8 @@ import loadConfig
> 
> class ConfigDotJSONTest(unittest.TestCase):
>     def test_configuration(self):
>-        loadConfig.loadBuilderConfig({})
>+        cwd = os.path.dirname(os.path.abspath(__file__))
>+        loadConfig.loadBuilderConfig({}, master_prefix_path=cwd)
> 
> 
> class TagsForBuilderTeest(unittest.TestCase):

Actions: View | Formatted Diff | Diff

Attachments on bug 186872: 343204