Small changes in TestSlurmQueue

Author: aalitaiga

smartdispatch/tests/test_job_generator.py

@@ -295,12 +295,15 @@ def setUp(self):
             self.dummy_pbs = dummy_generator.pbs_list
 
     def test_ppn_ncpus(self):
-        assert_true("ppn" not in str(self.pbs[0]))
-        assert_true("ncpus" in str(self.pbs[0]))
         assert_true("ppn" in str(self.dummy_pbs[0]))
         assert_true("ncpus" not in str(self.dummy_pbs[0]))
+        assert_true("ppn" not in str(self.pbs[0]))
+        assert_true("ncpus" in str(self.pbs[0]))
+
 
     def test_gpus_naccelerators(self):
+        assert_true("gpus" in str(self.dummy_pbs[0]))
+        assert_true("naccelerators" not in str(self.dummy_pbs[0]))
         assert_true("gpus" not in str(self.pbs[0]))
         assert_true("naccelerators" in str(self.pbs[0]))
 

smartdispatch/tests/test_utils.py

@@ -2,10 +2,9 @@
 import unittest
 try:
     from mock import patch
-    import mock
 except ImportError:
     from unittest.mock import patch
-    import unittest.mock
+
 from nose.tools import assert_equal, assert_true
 from numpy.testing import assert_array_equal
 import subprocess

smartdispatch/utils.py

@@ -133,9 +133,12 @@ def detect_cluster():
     return cluster_name
 
 def get_slurm_cluster_name():
-    stdout = Popen("sacctmgr list cluster", stdout=PIPE, shell=True).communicate()[0]
-    stdout = stdout.decode()
-    cluster_name = stdout.splitlines()[2].strip().split(' ')[0]
+    try:
+        stdout = Popen("sacctmgr list cluster", stdout=PIPE, shell=True).communicate()[0]
+        stdout = stdout.decode()
+        cluster_name = stdout.splitlines()[2].strip().split(' ')[0]
+    except IndexError, OSError:
+        return None
     return cluster_name
 
 def get_launcher(cluster_name):