Title: [242707] trunk/Tools
- Revision
- 242707
- Author
- aakash_j...@apple.com
- Date
- 2019-03-11 09:38:06 -0700 (Mon, 11 Mar 2019)
Log 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:
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py (242706 => 242707)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2019-03-11 16:25:41 UTC (rev 242706)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2019-03-11 16:38:06 UTC (rev 242707)
@@ -37,9 +37,14 @@
STEP_NAME_LENGTH_LIMIT = 50
-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'])
Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py (242706 => 242707)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py 2019-03-11 16:25:41 UTC (rev 242706)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py 2019-03-11 16:38:06 UTC (rev 242707)
@@ -33,7 +33,7 @@
class ConfigDotJSONTest(unittest.TestCase):
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):
cwd = os.path.dirname(os.path.abspath(__file__))
Modified: trunk/Tools/BuildSlaveSupport/ews-build/master.cfg (242706 => 242707)
--- trunk/Tools/BuildSlaveSupport/ews-build/master.cfg 2019-03-11 16:25:41 UTC (rev 242706)
+++ trunk/Tools/BuildSlaveSupport/ews-build/master.cfg 2019-03-11 16:38:06 UTC (rev 242707)
@@ -24,7 +24,7 @@
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')
c['services'] = [event_reporter]
Modified: trunk/Tools/ChangeLog (242706 => 242707)
--- trunk/Tools/ChangeLog 2019-03-11 16:25:41 UTC (rev 242706)
+++ trunk/Tools/ChangeLog 2019-03-11 16:38:06 UTC (rev 242707)
@@ -1,3 +1,16 @@
+2019-03-11 Aakash Jain <aakash_j...@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 <tsav...@apple.com>
Unreviewed, rolling out r242702.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
