diff --git a/ChangeLog b/ChangeLog index 540520171..f756250f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ - TW-1750 REG_ENHANCED, used in RX.cpp, isn't defined in all versions of Darwin (thanks to Misty De Meo). - TW-1752 cleanup of diag output (thanks to David Patrick). +- TW-1756 The columns.t unit test fails two tests after 2300 local. - Fixed broken build for Cygwin and older GCC (thanks to Richard Boß). - The default configuration is now 256-color only. - The 'columns' report now shows whether a column is modifiable or read only. diff --git a/test/columns.t b/test/columns.t index fa389f7ba..469e0ebfe 100755 --- a/test/columns.t +++ b/test/columns.t @@ -373,7 +373,7 @@ class TestDateFormats(TestCase): """Verify due.age formatting""" code, out, err = self.t("xxx rc.report.xxx.columns:id,due.age") self.assertRegexpMatches(out, r'1\s+[0-9.]+d') - self.assertRegexpMatches(out, r'2\s+-[0-9.]+h') + self.assertRegexpMatches(out, r'2\s+-[0-9.]+[hmin]+') def test_date_format_remaining(self): """Verify due.remaining formatting""" @@ -385,7 +385,7 @@ class TestDateFormats(TestCase): """Verify due.relative formatting""" code, out, err = self.t("xxx rc.report.xxx.columns:id,due.relative") self.assertRegexpMatches(out, r'1\s+-[0-9.]+d') - self.assertRegexpMatches(out, r'2\s+[0-9.]+h') + self.assertRegexpMatches(out, r'2\s+[0-9.]+[hmin]+') def test_date_format_countdown(self): """Verify due.countdown formatting"""