Fix failing tests

Author: Anton Khodak

cwltool/expression.py

@@ -185,7 +185,7 @@ def interpolate(scan, rootvars,
             e = evaluator(scan[w[0] + 1:w[1]], jslib, rootvars, fullJS=fullJS,
                           timeout=timeout, force_docker_pull=force_docker_pull,
                           debug=debug, js_console=js_console)
-            if w[0] == 0 and w[1] == len(scan) and len(parts) < 1:
+            if w[0] == 0 and w[1] == len(scan) and len(parts) <= 1:
                 return e
             leaf = json.dumps(e, sort_keys=True)
             if leaf[0] == '"':

tests/test_js_sandbox.py

@@ -45,4 +45,4 @@ class TestValueFrom(unittest.TestCase):
     def test_value_from_two_concatenated_expressions(self):
         f = cwltool.factory.Factory()
         echo = f.make(get_data("tests/wf/vf-concat.cwl"))
-        self.assertEqual(echo(), {u"out": u"a sting\\n"})
+        self.assertEqual(echo(), {u"out": u"a sting\n"})