From b4276a90584832d38c0c6d6d2585a5ad3bc85966 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 10 Nov 2015 17:01:16 +0000 Subject: Fix unit tests Tests were broken since https://gerrit.baserock.org/#/c/1418/ was merged. Change-Id: I4e5a139d84946514634214938990cca3c86f4512 --- morphlib/util_tests.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/morphlib/util_tests.py b/morphlib/util_tests.py index 20972a58..a43c9a60 100644 --- a/morphlib/util_tests.py +++ b/morphlib/util_tests.py @@ -54,17 +54,11 @@ class SanitiseMorphologyPathTests(unittest.TestCase): class MakeConcurrencyTests(unittest.TestCase): - def test_returns_2_for_1_core(self): - self.assertEqual(morphlib.util.make_concurrency(cores=1), 2) + def test_concurrency_is_num_cores(self): + self.assertEqual(morphlib.util.make_concurrency(cores=2), 2) - def test_returns_3_for_2_cores(self): - self.assertEqual(morphlib.util.make_concurrency(cores=2), 3) - - def test_returns_5_for_3_cores(self): - self.assertEqual(morphlib.util.make_concurrency(cores=3), 5) - - def test_returns_6_for_4_cores(self): - self.assertEqual(morphlib.util.make_concurrency(cores=4), 6) + def test_concurrency_is_maximum_20(self): + self.assertEqual(morphlib.util.make_concurrency(cores=21), 20) class FindParentOfTests(unittest.TestCase): -- cgit v1.2.1