From f59caeae7bc2590135358a29ef6e9cb18c153475 Mon Sep 17 00:00:00 2001 From: ABCbum Date: Sat, 25 Jan 2020 02:18:06 +0700 Subject: [PATCH] Test all four cases of whipper version schemes Group different version schemes with the actual one generated from the logger in a list to avoid parsing a whole .log file. The four possible cases are documented here: https://github.com/pypa/setuptools_scm/#default-versioning-scheme. Fixes: #427. Signed-off-by: ABCbum --- whipper/test/test_result_logger.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/whipper/test/test_result_logger.py b/whipper/test/test_result_logger.py index 8b7f214..33aeed9 100644 --- a/whipper/test/test_result_logger.py +++ b/whipper/test/test_result_logger.py @@ -139,14 +139,19 @@ class LoggerTestCase(unittest.TestCase): # RegEX updated to support all the 4 cases of the versioning scheme: # https://github.com/pypa/setuptools_scm/#default-versioning-scheme - self.assertRegex( - actualLines[0], - re.compile(( - r'Log created by: whipper ' - r'[\d]+\.[\d]+\.[\d]+(\+d\d{8}|\.dev[\w\.\+]+)? ' - r'\(internal logger\)' - )) - ) + versionSchemes = [ + actualLines[0], # 'Log created by: whipper 0.7.4.dev87+gb71ec9f.d20191026 (internal logger)' # noqa: E501 + 'Log created by: whipper 0.7.4.dev87+gb71ec9f (internal logger)', + 'Log created by: whipper 0.7.4+d20191026 (internal logger)', + 'Log created by: whipper 0.7.4 (internal logger)' + ] + created_by_re = re.compile(( + r'Log created by: whipper ' + r'[\d]+\.[\d]+\.[\d]+(\+d\d{8}|\.dev[\w\.\+]+)? ' + r'\(internal logger\)' + )) + for versionScheme in versionSchemes: + self.assertRegex(versionScheme, created_by_re) self.assertRegex( actualLines[1], re.compile((