Merge branch 'master' into fix/js-expr-for-null-inputs

Author: mr-c

tests/override/echo.cwl

@@ -15,5 +15,5 @@ outputs:
       glob: out.txt
       loadContents: true
       outputEval: $(self[0].contents)
-arguments: ["echo", "-n", $(inputs.m1), {shellQuote: false, valueFrom: "$MESSAGE"}]
+arguments: ["echo", $(inputs.m1), {shellQuote: false, valueFrom: "$MESSAGE"}]
 stdout: out.txt

tests/test_override.py

@@ -23,44 +23,44 @@ def test_overrides(self):
         self.assertEquals(main([get_data('tests/override/echo.cwl'),
                                 get_data('tests/override/echo-job.yml')],
                                stdout=sio), 0)
-        self.assertEquals({"out": "zing hello1"}, json.loads(sio.getvalue()))
+        self.assertEquals({"out": "zing hello1\n"}, json.loads(sio.getvalue()))
 
         sio = StringIO()
         self.assertEquals(main(["--overrides", get_data('tests/override/ov.yml'),
                                 get_data('tests/override/echo.cwl'),
                                 get_data('tests/override/echo-job.yml')],
                                stdout=sio), 0)
-        self.assertEquals({"out": "zing hello2"}, json.loads(sio.getvalue()))
+        self.assertEquals({"out": "zing hello2\n"}, json.loads(sio.getvalue()))
 
         sio = StringIO()
         self.assertEquals(main([get_data('tests/override/echo.cwl'),
                                 get_data('tests/override/echo-job-ov.yml')],
                                stdout=sio), 0)
-        self.assertEquals({"out": "zing hello3"}, json.loads(sio.getvalue()))
+        self.assertEquals({"out": "zing hello3\n"}, json.loads(sio.getvalue()))
 
         sio = StringIO()
         self.assertEquals(main([get_data('tests/override/echo-job-ov2.yml')],
                                stdout=sio), 0)
-        self.assertEquals({"out": "zing hello4"}, json.loads(sio.getvalue()))
+        self.assertEquals({"out": "zing hello4\n"}, json.loads(sio.getvalue()))
 
 
         sio = StringIO()
         self.assertEquals(main(["--overrides", get_data('tests/override/ov.yml'),
                                 get_data('tests/override/echo-wf.cwl'),
                                 get_data('tests/override/echo-job.yml')],
                                stdout=sio), 0)
-        self.assertEquals({"out": "zing hello2"}, json.loads(sio.getvalue()))
+        self.assertEquals({"out": "zing hello2\n"}, json.loads(sio.getvalue()))
 
         sio = StringIO()
         self.assertEquals(main(["--overrides", get_data('tests/override/ov2.yml'),
                                 get_data('tests/override/echo-wf.cwl'),
                                 get_data('tests/override/echo-job.yml')],
                                stdout=sio), 0)
-        self.assertEquals({"out": "zing hello5"}, json.loads(sio.getvalue()))
+        self.assertEquals({"out": "zing hello5\n"}, json.loads(sio.getvalue()))
 
         sio = StringIO()
         self.assertEquals(main(["--overrides", get_data('tests/override/ov3.yml'),
                                 get_data('tests/override/echo-wf.cwl'),
                                 get_data('tests/override/echo-job.yml')],
                                stdout=sio), 0)
-        self.assertEquals({"out": "zing hello6"}, json.loads(sio.getvalue()))
+        self.assertEquals({"out": "zing hello6\n"}, json.loads(sio.getvalue()))