4294: additional unit tests

[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 b27f69f15c2431493a49ecb5daf09f50ea710187..ae5bf1e90872371671a784a44c8e40f62954487e 100644 (file)
--- a/services/nodemanager/tests/test_jobqueue.py
+++ b/services/nodemanager/tests/test_jobqueue.py
@@ -14,7 +14,9 @@ class ServerCalculatorTestCase(unittest.TestCase):
 
     def calculate(self, servcalc, *constraints):
         return servcalc.servers_for_queue(
-            [{'runtime_constraints': cdict} for cdict in constraints])
+            [{'uuid': 'zzzzz-jjjjj-{:015x}'.format(index),
+              'runtime_constraints': cdict}
+             for index, cdict in enumerate(constraints)])
 
     def test_empty_queue_needs_no_servers(self):
         servcalc = self.make_calculator([1])
@@ -46,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):