From e0dbf4b691cee50e4f274dffc20fe3c1342b5a02 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 24 Jan 2018 21:53:26 -0500 Subject: [PATCH] Tests: Fixed broken color merge tests --- test/color.rules.t | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/color.rules.t b/test/color.rules.t index f3d3a1c3a..3379244be 100755 --- a/test/color.rules.t +++ b/test/color.rules.t @@ -229,11 +229,10 @@ class TestColorRulesMerging(TestCase): self.t.config('color.tagged','on white') self.t.config('rule.color.precedence', 'due,tagged') - self.t('add due:today +home hometask') # Task that matches both color rules + self.t('add due:tomorrow +home hometask') # Task that matches both color rules @unittest.skipIf('CYGWIN' in platform.system(), 'Skipping color merge test for Cygwin') @unittest.skipIf('FreeBSD' in platform.system(), 'Skipping color merge test for FREEBSD') - @unittest.expectedFailure def test_colors_merge(self): """Tests whether colors merge""" code, out, err = self.t('1 info') @@ -241,8 +240,6 @@ class TestColorRulesMerging(TestCase): @unittest.skipIf('CYGWIN' in platform.system(), 'Skipping color merge test for Cygwin') @unittest.skipIf('FreeBSD' in platform.system(), 'Skipping color merge test for FREEBSD') - @unittest.expectedFailure - @unittest.expectedFailure def test_colors_merge_off(self): """No color merge behaviour with rule.color.merge=no""" self.t.config('rule.color.merge', 'no')