Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (271674 => 271675)
--- trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-01-20 22:38:10 UTC (rev 271674)
+++ trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-01-20 23:06:00 UTC (rev 271675)
@@ -56,6 +56,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
])
@@ -69,6 +70,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
])
@@ -85,6 +87,7 @@
_BuildStepFactory(steps.ValidatePatch),
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.UpdateWorkingDirectory),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.CheckStyle),
@@ -98,6 +101,7 @@
_BuildStepFactory(steps.ValidatePatch),
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.UpdateWorkingDirectory),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.ApplyWatchList),
@@ -113,6 +117,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.RunBindingsTests),
])
@@ -126,6 +131,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.RunWebKitPerlTests),
])
@@ -140,6 +146,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.RunWebKitPyPython2Tests),
_BuildStepFactory(steps.RunWebKitPyPython3Tests),
@@ -156,6 +163,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.RunEWSUnitTests),
_BuildStepFactory(steps.RunEWSBuildbotCheckConfig),
@@ -174,6 +182,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileWebKit, skipUpload=False),
@@ -188,6 +197,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileWebKit, skipUpload=False),
@@ -203,6 +213,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileWebKit, skipUpload=True),
@@ -217,6 +228,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileWebKit, skipUpload=False),
@@ -231,6 +243,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileWebKit, skipUpload=True),
@@ -245,6 +258,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileWebKit, skipUpload=True),
@@ -259,6 +273,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileWebKit, skipUpload=True),
@@ -273,6 +288,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.InstallGtkDependencies),
@@ -288,6 +304,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.InstallWpeDependencies),
@@ -303,6 +320,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileWebKit, skipUpload=True),
@@ -318,6 +336,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileJSC),
@@ -333,6 +352,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileJSC),
@@ -350,6 +370,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileWebKit, skipUpload=True),
@@ -369,6 +390,7 @@
_BuildStepFactory(steps.ValidateCommiterAndReviewer),
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.UpdateWorkingDirectory),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.ValidateChangeLogAndReviewer),
@@ -400,6 +422,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.DownloadBuiltProduct),
_BuildStepFactory(steps.ExtractBuiltProduct),
@@ -420,6 +443,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.DownloadBuiltProduct),
_BuildStepFactory(steps.ExtractBuiltProduct),
@@ -439,6 +463,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.DownloadBuiltProduct),
_BuildStepFactory(steps.ExtractBuiltProduct),
@@ -458,6 +483,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.DownloadBuiltProduct),
_BuildStepFactory(steps.ExtractBuiltProduct),
@@ -477,6 +503,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.InstallGtkDependencies),
_BuildStepFactory(steps.DownloadBuiltProduct),
@@ -498,6 +525,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileJSC),
@@ -513,6 +541,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileJSC),
@@ -530,6 +559,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileJSC),
@@ -545,6 +575,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.KillOldProcesses),
_BuildStepFactory(steps.CompileJSC),
@@ -562,6 +593,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.DownloadBuiltProduct),
_BuildStepFactory(steps.ExtractBuiltProduct),
@@ -579,6 +611,7 @@
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
_BuildStepFactory(steps.CheckOutSpecificRevision),
+ _BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.DownloadBuiltProduct),
_BuildStepFactory(steps.ExtractBuiltProduct),
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (271674 => 271675)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-01-20 22:38:10 UTC (rev 271674)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-01-20 23:06:00 UTC (rev 271675)
@@ -49,7 +49,7 @@
ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch, RunBindingsTests, RunBuildWebKitOrgUnitTests,
RunEWSBuildbotCheckConfig, RunEWSUnitTests, RunResultsdbpyTests, RunJavaScriptCoreTests,
RunJSCTestsWithoutPatch, RunWebKit1Tests, RunWebKitPerlTests, RunWebKitPyPython2Tests,
- RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsWithoutPatch, TestWithFailureCount,
+ RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsWithoutPatch, TestWithFailureCount, ShowIdentifier,
Trigger, TransferToS3, UnApplyPatchIfRequired, UpdateWorkingDirectory, UploadBuiltProduct,
UploadTestResults, ValidateCommiterAndReviewer, ValidatePatch)
@@ -3767,5 +3767,43 @@
return self.runStep()
+class TestShowIdentifier(BuildStepMixinAdditions, unittest.TestCase):
+ def setUp(self):
+ self.longMessage = True
+ return self.setUpBuildStep()
+
+ def tearDown(self):
+ return self.tearDownBuildStep()
+
+ def test_success(self):
+ self.setupStep(ShowIdentifier())
+ self.setProperty('ews_revision', '51a6aec9f664')
+ self.expectRemoteCommands(
+ ExpectShell(workdir='wkdir',
+ timeout=300,
+ logEnviron=False,
+ command=['python', 'Tools/Scripts/git-webkit', '-C', 'https://github.com/WebKit/Webkit', 'find', '51a6aec9f664']) +
+ ExpectShell.log('stdio', stdout='Identifier: 233175@main') +
+ 0,
+ )
+ self.expectOutcome(result=SUCCESS, state_string='Identifier: 233175@main')
+ rc = self.runStep()
+ self.assertEqual(self.getProperty('identifier'), '233175@main')
+ return rc
+
+ def test_failure(self):
+ self.setupStep(ShowIdentifier())
+ self.expectRemoteCommands(
+ ExpectShell(workdir='wkdir',
+ timeout=300,
+ logEnviron=False,
+ command=['python', 'Tools/Scripts/git-webkit', '-C', 'https://github.com/WebKit/Webkit', 'find', 'HEAD']) +
+ ExpectShell.log('stdio', stdout='Unexpected failure') +
+ 2,
+ )
+ self.expectOutcome(result=FAILURE, state_string='Failed to find identifier')
+ return self.runStep()
+
+
if __name__ == '__main__':
unittest.main()