From 3937f1efb0dee104bc6e0a5c95a9a2505828483b Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Sun, 21 Nov 2021 22:16:22 +0000 Subject: [PATCH] Don't look for a specific sha when testing `task version` This allows tests to pass even with a dirty working copy or when running tests via `git rebase`. --- test/version.t | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/version.t b/test/version.t index 63a09f900..2e4dfc5a0 100755 --- a/test/version.t +++ b/test/version.t @@ -77,11 +77,6 @@ class TestVersion(TestCase): self.assertIn("MIT license", out) self.assertIn("https://taskwarrior.org", out) - def slurp_git(self): - git_cmd = ("git", "rev-parse", "--short", "--verify", "HEAD") - _, hash, _ = run_cmd_wait(git_cmd) - return hash.rstrip("\n") - def test_under_version(self): """_version and diagnostics output expected version and syntax""" code, out, err = self.t("_version") @@ -94,8 +89,7 @@ class TestVersion(TestCase): if os.path.exists("../.git"): if 2 >= len(version) > 0: git = version[1] - git_expected = "({0})".format(self.slurp_git()) - self.assertEqual(git_expected, git) + self.assertRegex(git, r'\([a-f0-9]*\)')) else: raise ValueError("Unexpected output from _version '{0}'".format( out))