Merge pull request #18 from Autodesk/subprocess_environment

Subprocess jobs inherit parent environment
Autodesk · Sep 27, 2017 · a5128ea · a5128ea
2 parents 247ec38 + 9b38780
commit a5128ea
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/pyccc/engines/subproc.py b/pyccc/engines/subproc.py
@@ -64,12 +64,14 @@ def submit(self, job):
             for filename, f in job.inputs.items():
                 f.put(os.path.join(job.workingdir, filename))
 
+        subenv = os.environ.copy()
+        subenv['PYTHONIOENCODING'] = 'utf-8'
         job.subproc = subprocess.Popen(job.command,
                                        shell=True,
                                        cwd=job.workingdir,
                                        stdout=subprocess.PIPE,
                                        stderr=subprocess.PIPE,
-                                       env={'PYTHONIOENCODING': 'utf-8'})
+                                       env=subenv)
         job.jobid = job.subproc.pid
         job._started = True
         return job.subproc.pid

diff --git a/pyccc/tests/test_job_types.py b/pyccc/tests/test_job_types.py
@@ -174,6 +174,21 @@ def test_bash_exitcode(fixture, request):
     assert job.exitcode == 35
 
 
+@pytest.fixture
+def set_env_var():
+    import os
+    assert 'NULL123' not in os.environ, "Bleeding environment"
+    os.environ['NULL123'] = 'nullabc'
+    yield
+    del os.environ['NULL123']
+
+
+def test_subprocess_environment_preserved(subprocess_engine, set_env_var):
+    job = subprocess_engine.launch(command='echo $NULL123', image='python:2.7-slim')
+    job.wait()
+    assert job.stdout.strip() == 'nullabc'
+
+
 @pytest.mark.parametrize('fixture', fixture_types['engine'])
 def test_python_exitcode(fixture, request):
     engine = request.getfuncargvalue(fixture)