gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Tests: Fixed broken color merge tests

Browse Source
This commit is contained in:
Paul Beckingham
2018-01-24 21:53:26 -05:00
parent 41491843de
commit e0dbf4b691
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/color.rules.t
View File

@@ -229,11 +229,10 @@ class TestColorRulesMerging(TestCase):
self.t.config('color.tagged','on white') self.t.config('color.tagged','on white')
self.t.config('rule.color.precedence', 'due,tagged') 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('CYGWIN' in platform.system(), 'Skipping color merge test for Cygwin')
@unittest.skipIf('FreeBSD' in platform.system(), 'Skipping color merge test for FREEBSD') @unittest.skipIf('FreeBSD' in platform.system(), 'Skipping color merge test for FREEBSD')
@unittest.expectedFailure
def test_colors_merge(self): def test_colors_merge(self):
"""Tests whether colors merge""" """Tests whether colors merge"""
code, out, err = self.t('1 info') 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('CYGWIN' in platform.system(), 'Skipping color merge test for Cygwin')
@unittest.skipIf('FreeBSD' in platform.system(), 'Skipping color merge test for FREEBSD') @unittest.skipIf('FreeBSD' in platform.system(), 'Skipping color merge test for FREEBSD')
@unittest.expectedFailure
@unittest.expectedFailure
def test_colors_merge_off(self): def test_colors_merge_off(self):
"""No color merge behaviour with rule.color.merge=no""" """No color merge behaviour with rule.color.merge=no"""
self.t.config('rule.color.merge', 'no') self.t.config('rule.color.merge', 'no')