jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Progressing dots to show test is running" ......................................................................
Revert "Progressing dots to show test is running"
Breaks tests; https://travis-ci.org/wikimedia/pywikibot-core/builds/26752150
This reverts commit 93379dbf499c58438917728b74862f282c15dba4.
Change-Id: Iacb4cc9e6999d265b46c558ed3999c1198f87de0 --- M tests/date_tests.py 1 file changed, 20 insertions(+), 34 deletions(-)
Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified
diff --git a/tests/date_tests.py b/tests/date_tests.py index 835f38b..730c5b3 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -13,45 +13,31 @@ class TestDate(unittest.TestCase): """Test cases for date library"""
- def __init__(self, formatname): - super(TestDate, self).__init__() - self.formatname = formatname + def testMapEntry(self): + """Test the validity of the pywikibot.date format maps.""" + for formatName in date.formats: + step = 1 + if formatName in date.decadeFormats: + step = 10 + predicate, start, stop = date.formatLimits[formatName]
- def testMapEntry(self, formatname): - """The test ported from date.py""" - step = 1 - if formatname in date.decadeFormats: - step = 10 - predicate, start, stop = date.formatLimits[formatname] + for code, convFunc in date.formats[formatName].items(): + for value in range(start, stop, step): + self.assertTrue( + predicate(value), + "date.formats['%(formatName)s']['%(code)s']:\n" + "invalid value %(value)d" % locals())
- for code, convFunc in date.formats[formatname].items(): - for value in range(start, stop, step): - self.assertTrue( - predicate(value), - "date.formats['%(formatname)s']['%(code)s']:\n" - "invalid value %(value)d" % locals()) - - newValue = convFunc(convFunc(value)) - self.assertEqual( - newValue, value, - "date.formats['%(formatname)s']['%(code)s']:\n" - "value %(newValue)d does not match %(value)s" - % locals()) - - def runTest(self): - """method called by unittest""" - self.testMapEntry(self.formatname) - - -def suite(): - """Setup the test suite and register all test to different instances""" - suite = unittest.TestSuite() - suite.addTests(TestDate(formatname) for formatname in date.formats) - return suite + newValue = convFunc(convFunc(value)) + self.assertEqual( + newValue, value, + "date.formats['%(formatName)s']['%(code)s']:\n" + "value %(newValue)d does not match %(value)s" + % locals())
if __name__ == '__main__': try: - unittest.TextTestRunner().run(suite()) + unittest.main() except SystemExit: pass