Windows fix to test_evaluators.

pints-team · Jul 24, 2018 · 0571beb · 0571beb
1 parent 126c089
commit 0571beb
Showing 1 changed file with 6 additions and 7 deletions.
diff --git 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):