From 246c3601bec41551cc2e63b7307cfee75f0d1462 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 Jan 2017 11:53:05 -0500
Subject: [PATCH] Tests: Combined two almost identical tests into one

---
 test/version.t | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/version.t b/test/version.t
index ab95d4139..5f9e93388 100755
--- a/test/version.t
+++ b/test/version.t
@@ -83,7 +83,7 @@ class TestVersion(TestCase):
         return hash.rstrip("\n")
 
     def test_under_version(self):
-        """_version outputs expected version and syntax"""
+        """_version and diagnostics output expected version and syntax"""
         code, out, err = self.t("_version")
 
         # version = "x.x.x (git-hash)" or simply "x.x.x"
@@ -102,12 +102,8 @@ class TestVersion(TestCase):
         ver_expected = self.slurp()
         self.assertEqual(ver_expected, ver)
 
-    def test_task_git_version(self):
-        """Task binary matches the current git commit"""
-        expected = "Commit: {0}".format(self.slurp_git())
-
         code, out, err = self.t.diag()
-        self.assertIn(expected, out)
+        self.assertIn(ver_expected, out)
 
     def test_version_option(self):
         """Verify that  'task --version' returns something valid"""