Title: [258084] trunk/Tools
- Revision
- 258084
- Author
- [email protected]
- Date
- 2020-03-07 16:14:50 -0800 (Sat, 07 Mar 2020)
Log Message
[ews] commit queue is not skipping layout tests for rollout patches
https://bugs.webkit.org/show_bug.cgi?id=208716
Unreviewed minor fix.
* BuildSlaveSupport/ews-build/steps.py:
(RunWebKitTests.doStepIf):
(RunWebKit1Tests.doStepIf): Moved to base class RunWebKitTests.
* BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-test.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (258083 => 258084)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-03-07 23:20:51 UTC (rev 258083)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-03-08 00:14:50 UTC (rev 258084)
@@ -1618,6 +1618,9 @@
shell.Test.__init__(self, logEnviron=False, **kwargs)
self.incorrectLayoutLines = []
+ def doStepIf(self, step):
+ return not (self.getProperty('rollout') and self.getProperty('buildername', '').lower() == 'commit-queue')
+
def start(self):
self.log_observer = logobserver.BufferLogObserver(wantStderr=True)
self.addLogObserver('stdio', self.log_observer)
@@ -1923,10 +1926,7 @@
self.setProperty('use-dump-render-tree', True)
return RunWebKitTests.start(self)
- def doStepIf(self, step):
- return not (self.getProperty('rollout') and self.getProperty('buildername', '').lower() == 'commit-queue')
-
class ArchiveBuiltProduct(shell.ShellCommand):
command = ['python', 'Tools/BuildSlaveSupport/built-product-archive',
WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'archive']
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (258083 => 258084)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-03-07 23:20:51 UTC (rev 258083)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-03-08 00:14:50 UTC (rev 258084)
@@ -1518,6 +1518,15 @@
self.expectOutcome(result=WARNINGS, state_string='2 flakes')
return self.runStep()
+ def test_skip_for_rollout_patches_on_commit_queue(self):
+ self.configureStep()
+ self.setProperty('buildername', 'Commit-Queue')
+ self.setProperty('fullPlatform', 'mac')
+ self.setProperty('configuration', 'debug')
+ self.setProperty('rollout', True)
+ self.expectOutcome(result=SKIPPED, state_string='layout-tests (skipped)')
+ return self.runStep()
+
def test_parse_results_json_regression(self):
self.configureStep()
self.setProperty('fullPlatform', 'ios-simulator')
Modified: trunk/Tools/ChangeLog (258083 => 258084)
--- trunk/Tools/ChangeLog 2020-03-07 23:20:51 UTC (rev 258083)
+++ trunk/Tools/ChangeLog 2020-03-08 00:14:50 UTC (rev 258084)
@@ -1,3 +1,15 @@
+2020-03-06 Aakash Jain <[email protected]>
+
+ [ews] commit queue is not skipping layout tests for rollout patches
+ https://bugs.webkit.org/show_bug.cgi?id=208716
+
+ Unreviewed minor fix.
+
+ * BuildSlaveSupport/ews-build/steps.py:
+ (RunWebKitTests.doStepIf):
+ (RunWebKit1Tests.doStepIf): Moved to base class RunWebKitTests.
+ * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-test.
+
2020-03-05 Sam Weinig <[email protected]>
Move _javascript_Core related feature defines from FeatureDefines.xcconfig to PlatformEnableCocoa.h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
