maintenance: remove unittest from test_override

Author: psafont

tests/test_override.py

@@ -1,61 +1,55 @@
-from __future__ import absolute_import
-
 import json
-import unittest
 
 from six import StringIO
 
+import pytest
+
 from cwltool.main import main
 
 from .util import get_data, needs_docker
 
-
-class TestOverride(unittest.TestCase):
-    @needs_docker
-    def test_overrides(self):
-        sio = StringIO()
-
-        self.assertEquals(main([get_data('tests/override/echo.cwl'),
-                                get_data('tests/override/echo-job.yml')],
-                               stdout=sio), 0)
-        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\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\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\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\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\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\n"}, json.loads(sio.getvalue()))
+override_parameters = [
+    ([get_data('tests/override/echo.cwl'),
+      get_data('tests/override/echo-job.yml')],
+     {"out": "zing hello1\n"}
+     ),
+    (["--overrides",
+      get_data('tests/override/ov.yml'),
+      get_data('tests/override/echo.cwl'),
+      get_data('tests/override/echo-job.yml')],
+     {"out": "zing hello2\n"}
+     ),
+    ([get_data('tests/override/echo.cwl'),
+      get_data('tests/override/echo-job-ov.yml')],
+     {"out": "zing hello3\n"}
+     ),
+    ([get_data('tests/override/echo-job-ov2.yml')],
+     {"out": "zing hello4\n"}
+     ),
+    (["--overrides",
+      get_data('tests/override/ov.yml'),
+      get_data('tests/override/echo-wf.cwl'),
+      get_data('tests/override/echo-job.yml')],
+     {"out": "zing hello2\n"}
+     ),
+    (["--overrides",
+      get_data('tests/override/ov2.yml'),
+      get_data('tests/override/echo-wf.cwl'),
+      get_data('tests/override/echo-job.yml')],
+     {"out": "zing hello5\n"}
+     ),
+    (["--overrides",
+      get_data('tests/override/ov3.yml'),
+      get_data('tests/override/echo-wf.cwl'),
+      get_data('tests/override/echo-job.yml')],
+     {"out": "zing hello6\n"}
+     ),
+]
+
+@needs_docker
+@pytest.mark.parametrize('parameters,result', override_parameters)
+def test_overrides(parameters, result):
+    sio = StringIO()
+
+    assert main(parameters, stdout=sio) == 0
+    assert json.loads(sio.getvalue()) == result