Fix signature and unit test of _check_timeout

Author: amat27

hpc_cluster_manager.py

@@ -173,7 +173,7 @@ def check_fqdn_collision(self, fqdn):
         return False
 
     def _check_timeout(self, now=None):
-        # type: (datetime) -> ([SlaveInfo], [SlaveInfo], [SlaveInfo])
+        # type: (datetime) -> ([SlaveInfo], [SlaveInfo])
         # TODO: Check configuring timeout
         if now is None:
             now = datetime.now(pytz.utc)

hpc_cluster_manger_unittest.py

@@ -191,21 +191,21 @@ def test_check_node_idle_idle_after_remove(self, mock_restc):
     def test_provisioning_time_out_negative(self, mock_restc):
         clusmgr = HpcClusterManager(mock_restc, provisioning_timeout=TENMINUTES)
         clusmgr.add_slaveinfo(HOST1HOSTNAME, HOST1AGENTID, HOST1TASKID1, 1, UTCNOW)
-        res, _, _ = clusmgr._check_timeout(UTCNOW + TENMINUTES - ONESEC)
+        res, _ = clusmgr._check_timeout(UTCNOW + TENMINUTES - ONESEC)
         self.assertFalse(res)
 
     @patch("hpc_cluster_manager.HpcRestClient", autospec=True)
     def test_provisioning_time_out_positive(self, mock_restc):
         clusmgr = HpcClusterManager(mock_restc, provisioning_timeout=TENMINUTES)
         clusmgr.add_slaveinfo(HOST1HOSTNAME, HOST1AGENTID, HOST1TASKID1, 1, UTCNOW)
-        res, _, _ = clusmgr._check_timeout(UTCNOW + TENMINUTES)
+        res, _ = clusmgr._check_timeout(UTCNOW + TENMINUTES)
         self.assertTrue(res)
 
     @patch("hpc_cluster_manager.HpcRestClient", autospec=True)
     def test_provisioning_time_out_positive2(self, mock_restc):
         clusmgr = HpcClusterManager(mock_restc)
         clusmgr.add_slaveinfo(HOST1HOSTNAME, HOST1AGENTID, HOST1TASKID1, 1, UTCNOW)
-        res, _, _ = clusmgr._check_timeout()
+        res, _ = clusmgr._check_timeout()
         self.assertTrue(res)
 
     @patch("hpc_cluster_manager.HpcRestClient", autospec=True)