Merge pull request #1164 from common-workflow-language/over_env_preservation

Over env preservation

Author: mr-c

cwltool/job.py

@@ -442,9 +442,9 @@ def run(self,
 
         env = self.environment
         vars_to_preserve = runtimeContext.preserve_environment
-        if runtimeContext.preserve_entire_environment is not None:
+        if runtimeContext.preserve_entire_environment is not False:
             vars_to_preserve = os.environ
-        if vars_to_preserve is not None:
+        if vars_to_preserve:
             for key, value in os.environ.items():
                 if key in vars_to_preserve and key not in env:
                     # On Windows, subprocess env can't handle unicode.

release-test.sh

@@ -37,7 +37,7 @@ export HEAD=${TRAVIS_PULL_REQUEST_SHA:-$(git rev-parse HEAD)}
 
 if [ "${RELEASE_SKIP}" != "head" ]
 then
-	virtualenv testenv1
+	virtualenv testenv1 -p python3
 	# First we test the head
 	# shellcheck source=/dev/null
 	source testenv1/bin/activate
@@ -58,9 +58,9 @@ then
 	test_prefix=../ run_tests; popd
 fi
 
-virtualenv testenv2
-virtualenv testenv3
-virtualenv testenv4
+virtualenv testenv2 -p python3
+virtualenv testenv3 -p python3
+virtualenv testenv4 -p python3
 rm -Rf testenv[234]/local
 
 # Secondly we test via pip

tests/env.cwl

@@ -0,0 +1,13 @@
+cwlVersion: v1.0
+class: CommandLineTool
+inputs: []
+requirements:
+  ShellCommandRequirement: {}
+baseCommand: echo
+arguments:
+  - valueFrom: >
+      {\\"env_count\\": \$(env | wc -l)}
+    shellQuote: False
+stdout: cwl.output.json
+outputs:
+  env_count: int

tests/test_examples.py

@@ -931,3 +931,17 @@ def test_optional_numeric_output_0():
     assert "completed success" in stderr
     assert error_code == 0
     assert json.loads(stdout)['out'] == 0
+
+@windows_needs_docker
+def test_env_filtering():
+    test_file = "tests/env.cwl"
+    error_code, stdout, stderr = get_main_output(
+        [get_data(test_file)])
+
+    assert "completed success" in stderr, (error_code, stdout, stderr)
+    assert error_code == 0, (error_code, stdout, stderr)
+    if onWindows():
+        target = 5
+    else:
+        target = 4
+    assert json.loads(stdout)['env_count'] == target, (error_code, stdout, stderr)