Merge branch '2.4.5' of ssh://git.tasktools.org/tm/task into 2.4.5

This commit is contained in:
Paul Beckingham 2015-07-17 14:40:49 -04:00
commit 3f1f4853d6
82 changed files with 1436 additions and 1562 deletions

View file

@ -52,7 +52,7 @@ class TestVersion(TestCase):
def test_copyright_up_to_date(self):
"""Copyright is current"""
code, out, err = self.t(("version",))
code, out, err = self.t("version")
expected = "Copyright \(C\) \d{4} - %d" % (datetime.now().year,)
self.assertRegexpMatches(out, expected)
@ -70,7 +70,7 @@ class TestVersion(TestCase):
def test_version(self):
"""version command outputs expected version and license"""
code, out, err = self.t(("version",))
code, out, err = self.t("version")
expected = "task {0}".format(self.slurp())
self.assertIn(expected, out)
@ -84,7 +84,7 @@ class TestVersion(TestCase):
def test_under_version(self):
"""_version outputs expected version and syntax"""
code, out, err = self.t(("_version",))
code, out, err = self.t("_version")
# version = "x.x.x (git-hash)" or simply "x.x.x"
# corresponding to "compiled from git" or "compiled from tarball"