From d5bf83e4ccd4a0ea24a640f22f4fbfc1e2b631f4 Mon Sep 17 00:00:00 2001 From: JoeLametta Date: Tue, 3 Dec 2019 10:53:05 +0000 Subject: [PATCH] Whipper's version RegEX: support all valid scheme cases Initial work by ArchangeGabriel: https://github.com/whipper-team/whipper/pull/421 Fixes #420. Signed-off-by: JoeLametta --- whipper/test/test_result_logger.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whipper/test/test_result_logger.py b/whipper/test/test_result_logger.py index af8d5200..8b7f214e 100644 --- a/whipper/test/test_result_logger.py +++ b/whipper/test/test_result_logger.py @@ -137,11 +137,14 @@ def testLogger(self): # do not test on version line, date line, or SHA-256 hash line self.assertListEqual(actualLines[2:-1], expectedLines[2:-1]) + # 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]+\.dev[\w\.\+]+ \(internal logger\)' + r'[\d]+\.[\d]+\.[\d]+(\+d\d{8}|\.dev[\w\.\+]+)? ' + r'\(internal logger\)' )) ) self.assertRegex(