Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (179115 => 179116)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-26 16:25:09 UTC (rev 179115)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-26 17:20:20 UTC (rev 179116)
@@ -62,7 +62,7 @@
class TestWithFailureCount(shell.Test):
- failedTestsFormatString = "%d tests failed"
+ failedTestsFormatString = "%d test%s failed"
def countFailures(self, cmd):
return 0
@@ -70,6 +70,7 @@
def commandComplete(self, cmd):
shell.Test.commandComplete(self, cmd)
self.failedTestCount = self.countFailures(cmd)
+ self.failedTestPluralSuffix = "" if self.failedTestCount == 1 else "s"
def evaluateCommand(self, cmd):
if self.failedTestCount:
@@ -85,7 +86,7 @@
def getText2(self, cmd, results):
if results != SUCCESS and self.failedTestCount:
- return [self.failedTestsFormatString % self.failedTestCount]
+ return [self.failedTestsFormatString % (self.failedTestCount, self.failedTestPluralSuffix)]
return [self.name]
@@ -460,7 +461,7 @@
description = ["unit tests running"]
descriptionDone = ["unit-tests"]
command = ["perl", "./Tools/Scripts/run-api-tests", WithProperties("--%(configuration)s"), "--verbose"]
- failedTestsFormatString = "%d unit tests failed or timed out"
+ failedTestsFormatString = "%d unit test%s failed or timed out"
def start(self):
platform = self.getProperty('fullPlatform')
@@ -490,7 +491,7 @@
description = ["python-tests running"]
descriptionDone = ["python-tests"]
command = ["python", "./Tools/Scripts/test-webkitpy", "--verbose"]
- failedTestsFormatString = "%d python tests failed"
+ failedTestsFormatString = "%d python test%s failed"
def start(self):
platform = self.getProperty('platform')
@@ -521,7 +522,7 @@
description = ["perl-tests running"]
descriptionDone = ["perl-tests"]
command = ["perl", "./Tools/Scripts/test-webkitperl"]
- failedTestsFormatString = "%d perl tests failed"
+ failedTestsFormatString = "%d perl test%s failed"
def countFailures(self, cmd):
logText = cmd.logs['stdio'].getText()
@@ -540,7 +541,7 @@
description = ["cloop-tests running"]
descriptionDone = ["cloop-tests"]
command = ["perl", "./Tools/Scripts/run-_javascript_core-tests", "--cloop", "--no-build", "--no-jsc-stress", WithProperties("--%(configuration)s")]
- failedTestsFormatString = "%d regressions found."
+ failedTestsFormatString = "%d regression%s found."
def countFailures(self, cmd):
logText = cmd.logs['stdio'].getText()
@@ -559,7 +560,7 @@
description = ["32bit-jsc-tests running"]
descriptionDone = ["32bit-jsc-tests"]
command = ["perl", "./Tools/Scripts/run-_javascript_core-tests", "--32-bit", "--no-build", WithProperties("--%(configuration)s")]
- failedTestsFormatString = "%d regressions found."
+ failedTestsFormatString = "%d regression%s found."
def countFailures(self, cmd):
logText = cmd.logs['stdio'].getText()
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (179115 => 179116)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-26 16:25:09 UTC (rev 179115)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-26 17:20:20 UTC (rev 179116)
@@ -155,7 +155,7 @@
self.assertResults(FAILURE, ['5 regressions found.'], 1, ' 5 regressions found.')
def test_failure(self):
- self.assertResults(FAILURE, ['1 regressions found.'], 1, ' 1 regression found.')
+ self.assertResults(FAILURE, ['1 regression found.'], 1, ' 1 regression found.')
def test_no_failure(self):
self.assertResults(SUCCESS, ['webkit-jsc-cloop-test'], 0, ' 0 regressions found.')
@@ -176,7 +176,7 @@
self.assertResults(FAILURE, ['5 regressions found.'], 1, ' 5 failures found.')
def test_failure(self):
- self.assertResults(FAILURE, ['1 regressions found.'], 1, ' 1 failure found.')
+ self.assertResults(FAILURE, ['1 regression found.'], 1, ' 1 failure found.')
def test_no_failure(self):
self.assertResults(SUCCESS, ['webkit-32bit-jsc-test'], 0, ' 0 failures found.')
@@ -187,7 +187,8 @@
if expected_failure_count:
rc = 1
expected_results = FAILURE
- expected_text = '{0} unit tests failed or timed out'.format(expected_failure_count)
+ plural_suffix = "" if expected_failure_count == 1 else "s"
+ expected_text = '%d unit test%s failed or timed out' % (expected_failure_count, plural_suffix)
else:
rc = 0
expected_results = SUCCESS
Modified: trunk/Tools/ChangeLog (179115 => 179116)
--- trunk/Tools/ChangeLog 2015-01-26 16:25:09 UTC (rev 179115)
+++ trunk/Tools/ChangeLog 2015-01-26 17:20:20 UTC (rev 179116)
@@ -1,3 +1,24 @@
+2015-01-26 Csaba Osztrogonác <[email protected]>
+
+ [buildbot] Fix grammar of TestWithFailureCount
+ https://bugs.webkit.org/show_bug.cgi?id=140884
+
+ Reviewed by Alexey Proskuryakov.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (TestWithFailureCount):
+ (TestWithFailureCount.commandComplete):
+ (TestWithFailureCount.getText2):
+ (RunUnitTests):
+ (RunPythonTests):
+ (RunPerlTests):
+ (RunLLINTCLoopTests):
+ (Run32bitJSCTests):
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ (RunLLINTCLoopTestsTest.test_failure):
+ (Run32bitJSCTestsTest.test_failure):
+ (RunUnitTestsTest.assertFailures):
+
2015-01-26 Youenn Fablet <[email protected]>
Unreviewed. Moving myself to the committer section.
