Fix assertVersionOutput to handle 'pre' versions
authorPeter Amstutz <peter.amstutz@curii.com>
Thu, 16 Jan 2020 02:53:05 +0000 (21:53 -0500)
committerPeter Amstutz <peter.amstutz@curii.com>
Thu, 16 Jan 2020 02:53:05 +0000 (21:53 -0500)
no issue #

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

sdk/python/tests/arvados_testutil.py

index 21b3f15dc68ef7baecbfab65f4910faa3e4cf86f..6010d8b94523e524bdf69ca8552230d23c221a76 100644 (file)
@@ -93,7 +93,7 @@ class VersionChecker(object):
             # Python 2 writes version info on stderr.
             self.assertEqual(out.getvalue(), '')
             v = err.getvalue()
             # Python 2 writes version info on stderr.
             self.assertEqual(out.getvalue(), '')
             v = err.getvalue()
-        self.assertRegex(v, r"[0-9]+\.[0-9]+\.[0-9]+$\n")
+        self.assertRegex(v, r"[0-9]+\.[0-9]+\.[0-9]+(\.pre[0-9]+)?$\n")
 
 
 class FakeCurl(object):
 
 
 class FakeCurl(object):