Merge branch 'master' into 4486-document-arv

[arvados.git] / services / nodemanager / tests / test_jobqueue.py

diff --git a/services/nodemanager/tests/test_jobqueue.py b/services/nodemanager/tests/test_jobqueue.py
index 0a4d136d402cbfa7e022a25ad98bc300a5c640ce..ae5bf1e90872371671a784a44c8e40f62954487e 100644 (file)
--- a/services/nodemanager/tests/test_jobqueue.py
+++ b/services/nodemanager/tests/test_jobqueue.py
@@ -48,6 +48,29 @@ class ServerCalculatorTestCase(unittest.TestCase):
                                   {'min_scratch_mb_per_node': 200})
         self.assertEqual(6, len(servlist))
 
+    def test_server_calc_min_nodes_0_jobs(self):
+        servcalc = self.make_calculator([1], min_nodes=3, max_nodes=9)
+        servlist = self.calculate(servcalc, {})
+        self.assertEqual(3, len(servlist))
+
+    def test_server_calc_min_nodes_1_job(self):
+        servcalc = self.make_calculator([1], min_nodes=3, max_nodes=9)
+        servlist = self.calculate(servcalc, {'min_nodes': 1})
+        self.assertEqual(3, len(servlist))
+
+    def test_server_calc_more_jobs_than_min_nodes(self):
+        servcalc = self.make_calculator([1], min_nodes=2, max_nodes=9)
+        servlist = self.calculate(servcalc,
+                                  {'min_nodes': 1},
+                                  {'min_nodes': 1},
+                                  {'min_nodes': 1})
+        self.assertEqual(3, len(servlist))
+
+    def test_job_requesting_max_nodes_accepted(self):
+        servcalc = self.make_calculator([1], max_nodes=4)
+        servlist = self.calculate(servcalc, {'min_nodes': 4})
+        self.assertEqual(4, len(servlist))
+
 
 class JobQueueMonitorActorTestCase(testutil.RemotePollLoopActorTestMixin,
                                    unittest.TestCase):