fiddled some more with cli tests; fixed linter error

Author: jspaaks

tests/cli/cff_1_0_3/test_cli.py

@@ -1,20 +1,13 @@
-import os
 import pytest
 from click.testing import CliRunner
 from cffconvert.cli.cli import cli as cffconvert
 from tests.cli.helpers import get_formats
+from tests.cli.helpers import read_sibling_file
 
 
 @pytest.fixture(scope="module")
 def cffstr():
-    return read_sibling_file("CITATION.cff")
-
-
-def read_sibling_file(filename):
-    mydir = os.path.dirname(__file__)
-    fixture = os.path.join(mydir, filename)
-    with open(fixture, "rt", encoding="utf-8") as fid:
-        return fid.read()
+    return read_sibling_file(__file__, "CITATION.cff")
 
 
 def test_local_cff_file_does_not_exist():
@@ -42,9 +35,9 @@ def test_printing_of_version():
     assert result.output == "3.0.0a0\n"
 
 
-@pytest.mark.parametrize("fmt,fname", get_formats())
+@pytest.mark.parametrize("fmt, fname", get_formats())
 def test_printing_on_stdout(fmt, fname, cffstr):
-    expected = read_sibling_file(fname)
+    expected = read_sibling_file(__file__, fname)
     runner = CliRunner()
     with runner.isolated_filesystem():
         with open("CITATION.cff", "wt", encoding="utf-8") as fid:
@@ -55,8 +48,7 @@ def test_printing_on_stdout(fmt, fname, cffstr):
     assert expected == actual
 
 
-def test_raising_error_on_unsupported_format():
-    cffstr = read_sibling_file("CITATION.cff")
+def test_raising_error_on_unsupported_format(cffstr):
     runner = CliRunner()
     with runner.isolated_filesystem():
         with open("CITATION.cff", "wt", encoding="utf-8") as fid:
@@ -75,9 +67,9 @@ def test_without_arguments():
     assert result.exception.strerror == "No such file or directory"
 
 
-@pytest.mark.parametrize("fmt,fname", get_formats())
+@pytest.mark.parametrize("fmt, fname", get_formats())
 def test_writing_to_file(fmt, fname, cffstr):
-    expected = read_sibling_file(fname)
+    expected = read_sibling_file(__file__, fname)
     runner = CliRunner()
     with runner.isolated_filesystem():
         with open("CITATION.cff", "wt", encoding="utf-8") as fid:

tests/cli/cff_1_1_0/test_cli.py

@@ -48,8 +48,7 @@ def test_printing_on_stdout(fmt, fname, cffstr):
     assert expected == actual
 
 
-def test_raising_error_on_unsupported_format():
-    cffstr = read_sibling_file(__file__, "CITATION.cff")
+def test_raising_error_on_unsupported_format(cffstr):
     runner = CliRunner()
     with runner.isolated_filesystem():
         with open("CITATION.cff", "wt", encoding="utf-8") as fid:

tests/cli/cff_1_2_0/test_cli.py

@@ -1,20 +1,13 @@
-import os
 import pytest
 from click.testing import CliRunner
 from cffconvert.cli.cli import cli as cffconvert
 from tests.cli.helpers import get_formats
+from tests.cli.helpers import read_sibling_file
 
 
 @pytest.fixture(scope="module")
 def cffstr():
-    return read_sibling_file("CITATION.cff")
-
-
-def read_sibling_file(filename):
-    mydir = os.path.dirname(__file__)
-    fixture = os.path.join(mydir, filename)
-    with open(fixture, "rt", encoding="utf-8") as fid:
-        return fid.read()
+    return read_sibling_file(__file__, "CITATION.cff")
 
 
 def test_local_cff_file_does_not_exist():
@@ -44,7 +37,7 @@ def test_printing_of_version():
 
 @pytest.mark.parametrize("fmt, fname", get_formats())
 def test_printing_on_stdout(fmt, fname, cffstr):
-    expected = read_sibling_file(fname)
+    expected = read_sibling_file(__file__, fname)
     runner = CliRunner()
     with runner.isolated_filesystem():
         with open("CITATION.cff", "wt", encoding="utf-8") as fid:
@@ -55,8 +48,7 @@ def test_printing_on_stdout(fmt, fname, cffstr):
     assert expected == actual
 
 
-def test_raising_error_on_unsupported_format():
-    cffstr = read_sibling_file("CITATION.cff")
+def test_raising_error_on_unsupported_format(cffstr):
     runner = CliRunner()
     with runner.isolated_filesystem():
         with open("CITATION.cff", "wt", encoding="utf-8") as fid:
@@ -77,7 +69,7 @@ def test_without_arguments():
 
 @pytest.mark.parametrize("fmt, fname", get_formats())
 def test_writing_to_file(fmt, fname, cffstr):
-    expected = read_sibling_file(fname)
+    expected = read_sibling_file(__file__, fname)
     runner = CliRunner()
     with runner.isolated_filesystem():
         with open("CITATION.cff", "wt", encoding="utf-8") as fid:

tests/cli/cff_1_3_0/test_cli.py

@@ -48,8 +48,7 @@ def test_printing_on_stdout(fmt, fname, cffstr):
     assert expected == actual
 
 
-def test_raising_error_on_unsupported_format():
-    cffstr = read_sibling_file(__file__, "CITATION.cff")
+def test_raising_error_on_unsupported_format(cffstr):
     runner = CliRunner()
     with runner.isolated_filesystem():
         with open("CITATION.cff", "wt", encoding="utf-8") as fid:

tests/cli/helpers.py

@@ -20,5 +20,3 @@ def read_sibling_file(myfile, filename):
     fixture = os.path.join(mydir, filename)
     with open(fixture, "rt", encoding="utf-8") as fid:
         return fid.read()
-
-