Skip to content

Drop "-n" from echo command in test-override to make it portable #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 29, 2018
Merged

Drop "-n" from echo command in test-override to make it portable #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/override/echo.cwl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions tests/test_override.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()))