Changeset 242707 in webkit

Timestamp:

Mar 11, 2019, 9:38:06 AM (6 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-build] unit-tests fail when passwords.json is missing
​https://bugs.webkit.org/show_bug.cgi?id=195557

Reviewed by Lucas Forschler.

• BuildSlaveSupport/ews-build/loadConfig.py:

(loadBuilderConfig):

• BuildSlaveSupport/ews-build/loadConfig_unittest.py:

(ConfigDotJSONTest.test_configuration):

• BuildSlaveSupport/ews-build/master.cfg:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/loadConfig.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/loadConfig_unittest.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/master.cfg (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py

@@ -38 +38 @@
 
 
-def loadBuilderConfig(c, use_localhost_worker=False, master_prefix_path='./'):
+def loadBuilderConfig(c, is_test_mode_enabled=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')))
+    use_localhost_worker = is_test_mode_enabled
+    if is_test_mode_enabled:
+        passwords = {}
+    else:
+        passwords = json.load(open(os.path.join(master_prefix_path, 'passwords.json')))
+
     checkWorkersAndBuildersForConsistency(config, config['workers'], config['builders'])
     checkValidSchedulers(config, config['schedulers'])

trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py

@@ -34 +34 @@
     def test_configuration(self):
         cwd = os.path.dirname(os.path.abspath(__file__))
-        loadConfig.loadBuilderConfig({}, master_prefix_path=cwd)
+        loadConfig.loadBuilderConfig({}, is_test_mode_enabled=True, master_prefix_path=cwd)
 
     def test_builder_keys(self):

trunk/Tools/BuildSlaveSupport/ews-build/master.cfg

@@ -25 +25 @@
 c['buildbotNetUsageData'] = None
 
-loadConfig.loadBuilderConfig(c, use_localhost_worker=is_test_mode_enabled)
+loadConfig.loadBuilderConfig(c, is_test_mode_enabled=is_test_mode_enabled)
 
 event_reporter = Events(master_hostname='ews-build.webkit.org', type_prefix='ews')

trunk/Tools/ChangeLog

@@ +1 @@
+2019-03-11  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] unit-tests fail when passwords.json is missing
+        https://bugs.webkit.org/show_bug.cgi?id=195557
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/ews-build/loadConfig.py:
+        (loadBuilderConfig):
+        * BuildSlaveSupport/ews-build/loadConfig_unittest.py:
+        (ConfigDotJSONTest.test_configuration):
+        * BuildSlaveSupport/ews-build/master.cfg:
+
 2019-03-11  Truitt Savell  <tsavell@apple.com>