From 0571beb71ca5fd562124084f02597614a9013a4e Mon Sep 17 00:00:00 2001 From: Michael Clerx Date: Tue, 24 Jul 2018 09:10:56 +0100 Subject: [PATCH] Windows fix to test_evaluators. --- pints/tests/test_evaluators.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pints/tests/test_evaluators.py b/pints/tests/test_evaluators.py index b63e6ec96..dddcb5b2d 100755 --- a/pints/tests/test_evaluators.py +++ b/pints/tests/test_evaluators.py @@ -56,8 +56,8 @@ def test_sequential(self): self.assertRaises(ValueError, e.evaluate, 1) # Test args - e = pints.SequentialEvaluator(f_args, [10, 20, self]) - e.evaluate([1]) + e = pints.SequentialEvaluator(f_args, [10, 20]) + self.assertEqual(e.evaluate([1]), [31]) # Args must be a sequence self.assertRaises(ValueError, pints.SequentialEvaluator, f_args, 1) @@ -79,8 +79,8 @@ def test_parallel(self): self.assertRaises(ValueError, e.evaluate, 1) # Test args - e = pints.ParallelEvaluator(f_args, args=[10, 20, self]) - e.evaluate([1]) + e = pints.SequentialEvaluator(f_args, [10, 20]) + self.assertEqual(e.evaluate([1]), [31]) # Args must be a sequence self.assertRaises(ValueError, pints.ParallelEvaluator, f_args, args=1) @@ -174,9 +174,8 @@ def f(x): return x ** 2 -def f_args(x, y, z, testcase): - testcase.assertEqual(y, 10) - testcase.assertEqual(z, 20) +def f_args(x, y, z): + return x + y + z def ioerror_on_five(x):