From 9b4a94dadb711aeee1ad15f70b7bbc1fc017b378 Mon Sep 17 00:00:00 2001 From: FaQ Date: Thu, 2 May 2019 21:28:28 +0200 Subject: [PATCH] Tests were passing a list but the function expects a tuple --- doit/task.py | 2 +- tests/test_task.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doit/task.py b/doit/task.py index e3a6f7a3..4859e33b 100644 --- a/doit/task.py +++ b/doit/task.py @@ -407,7 +407,7 @@ def check_attr(task, attr, value, valid): @param valid (list): of valid types/value accepted @raises InvalidTask if invalid input """ - if isinstance(value, tuple(valid[0])): + if isinstance(value, valid[0]): return if value in valid[1]: return diff --git a/tests/test_task.py b/tests/test_task.py index 7dbca89f..8d63679d 100644 --- a/tests/test_task.py +++ b/tests/test_task.py @@ -51,21 +51,21 @@ def test_task_verbosity_not_specified(self): class TestTaskCheckInput(object): def testOkType(self): - task.Task.check_attr('xxx', 'attr', [], ([int, list],[])) + task.Task.check_attr('xxx', 'attr', [], ((int, list),())) def testOkTypeABC(self): - task.Task.check_attr('xxx', 'attr', {}, ([Iterable],[])) + task.Task.check_attr('xxx', 'attr', {}, ((Iterable,),())) def testOkValue(self): - task.Task.check_attr('xxx', 'attr', None, ([list], [None])) + task.Task.check_attr('xxx', 'attr', None, ((list,), (None,))) def testFailType(self): pytest.raises(task.InvalidTask, task.Task.check_attr, 'xxx', - 'attr', int, ([list], [False])) + 'attr', int, ((list,), (False,))) def testFailValue(self): pytest.raises(task.InvalidTask, task.Task.check_attr, 'xxx', - 'attr', True, ([list], [False])) + 'attr', True, ((list,), (False,)))