summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-10 17:01:16 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-11-14 20:15:26 +0000
commitb4276a90584832d38c0c6d6d2585a5ad3bc85966 (patch)
tree245e0dd59e6091953064672c1fb865bc0a93be6e
parent6e42b112b1cebaa486c926fda759a1144cd0fe45 (diff)
downloadmorph-b4276a90584832d38c0c6d6d2585a5ad3bc85966.tar.gz
Fix unit tests
Tests were broken since https://gerrit.baserock.org/#/c/1418/ was merged. Change-Id: I4e5a139d84946514634214938990cca3c86f4512
-rw-r--r--morphlib/util_tests.py14
1 files 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):