Add slurm runner unit tests

cli/popper/runner_slurm.py

@@ -22,12 +22,11 @@ def __exit__(self, exc_type, exc, traceback):
         SlurmRunner.spawned_processes = set()
 
     def exec_srun_cmd(self, cmd):
-        step_env = SlurmRunner.prepare_environment(self.step, os.environ)
         try:
             cmd.insert(0, 'srun')
             with Popen(cmd, stdout=PIPE, stderr=STDOUT,
                        universal_newlines=True, preexec_fn=os.setsid,
-                       env=step_env, cwd=self.config.workspace_dir) as p:
+                       cwd=self.config.workspace_dir) as p:
                 SlurmRunner.spawned_processes.add(p)
 
                 log.debug('Reading process output')
@@ -65,7 +64,6 @@ def __init__(self, config):
 
     def run(self, step):
         """Execute the given step in docker."""
-        self.step = step
         cid = pu.sanitized_name(step['name'], self.config.wid)
 
         build, img, dockerfile = HostDockerRunner.get_build_info(

cli/setup.py

@@ -15,6 +15,7 @@
     include_package_data=True,
     install_requires=[
         'dotmap',
+        'testfixtures',
         'python-vagrant',
         'GitPython',
         'spython',

cli/test/test_runner_slurm.py

@@ -0,0 +1,50 @@
+import os
+import unittest
+
+import utils as testutils
+
+from popper.parser import YMLWorkflow
+from popper.runner import WorkflowRunner
+from popper.runner_slurm import SlurmRunner, DockerRunner
+from popper.cli import log as log
+
+from dotmap import DotMap
+
+from testfixtures.mock import call
+from testfixtures import Replacer, ShouldRaise, compare
+from testfixtures.popen import MockPopen, PopenBehaviour
+
+
+class TestSlurmSlurmRunner(unittest.TestCase):
+    def setUp(self):
+        log.setLevel('CRITICAL')
+        self.Popen = MockPopen()
+        replacer = Replacer()
+        replacer.replace('popper.runner_slurm.Popen', self.Popen)
+        self.addCleanup(replacer.restore)
+
+    def test_exec_run(self):
+        self.Popen.set_command('srun ls -l', returncode=0)
+        config = DotMap()
+        config.workspace_dir = os.environ["HOME"]
+        slurm_runner = SlurmRunner(config)
+        self.assertEqual(slurm_runner.exec_srun_cmd(['ls', '-l']), 0)
+        self.assertEqual(len(SlurmRunner.spawned_processes), 0)
+
+
+class TestSlurmDockerRunner(unittest.TestCase):
+    def setUp(self):
+        log.setLevel('CRITICAL')
+        self.Popen = MockPopen()
+        replacer = Replacer()
+        replacer.replace('popper.runner_slurm.Popen', self.Popen)
+        self.addCleanup(replacer.restore)
+
+    def test_start_container(self):
+        self.Popen.set_command('srun docker start --attach', returncode=0)
+        config = DotMap()
+        config.workspace_dir = os.environ["HOME"]
+        docker_runner = DockerRunner(config)
+        self.assertEqual(docker_runner.exec_srun_cmd(
+            ['docker', 'start', '--attach']), 0)
+        self.assertEqual(len(SlurmRunner.spawned_processes), 0)

cli/test/test_utils.py

@@ -88,7 +88,9 @@ def test_load_config_file(self):
         pu.write_file('settings.yml', conf_content)
         config = pu.load_config_file('settings.yml')
         self.assertTrue(config.get('engine'), True)
-        self.assertDictEqual(config['engine']['options'], {'runtime': 'nvidia'})
+        self.assertDictEqual(
+            config['engine']['options'], {
+                'runtime': 'nvidia'})
         os.remove('settings.yml')
 
     def test_assert_executable_exists(self):