Merge branch 'issue1'

Author: JessicaTegner

tests/test_tinytex_1.py

@@ -3,10 +3,10 @@
 
 import pytest
 
-from .utils import download_tinytex_0
+from .utils import download_tinytex
 
-def test_successful_download(download_tinytex_0):
+def test_successful_download(download_tinytex):
 	assert os.path.isdir(os.path.join("tests", "tinytex_distribution"))
 
-def test_bin_is_in_distribution(download_tinytex_0):
+def test_bin_is_in_distribution(download_tinytex):
 	assert os.path.isdir(os.path.join("tests", "tinytex_distribution", "bin"))

tests/test_tinytex_2.py

@@ -1,14 +1,14 @@
 import os
 import pytest
 
-from .utils import download_tinytex_0
+from .utils import download_tinytex
 
 import pytinytex
 
-def test_empty_cache(download_tinytex_0):
+def test_empty_cache(download_tinytex):
 	assert pytinytex.__tinytex_path is None
 
-def test_failing_resolver(download_tinytex_0):
+def test_failing_resolver(download_tinytex):
 	assert pytinytex.__tinytex_path is None
 	with pytest.raises(RuntimeError):
 		pytinytex._resolve_path("failing")
@@ -17,13 +17,13 @@ def test_failing_resolver(download_tinytex_0):
 		pytinytex.ensure_tinytex_installed("failing")
 	assert pytinytex.__tinytex_path is None
 
-def test_successful_resolver(download_tinytex_0):
+def test_successful_resolver(download_tinytex):
 	assert pytinytex.__tinytex_path is None
 	pytinytex.ensure_tinytex_installed("tests")
 	assert isinstance(pytinytex.__tinytex_path, str)
 	assert os.path.isdir(pytinytex.__tinytex_path)
 
-def test_get_tinytex_path(download_tinytex_0):
+def test_get_tinytex_path(download_tinytex):
 	pytinytex.ensure_tinytex_installed("tests")
 	assert isinstance(pytinytex.get_tinytex_path(), str)
 	assert pytinytex.__tinytex_path == pytinytex.get_tinytex_path("tests")

tests/test_tinytex_0.py tests/test_tinytex_download.pytests/test_tinytex_0.py renamed to tests/test_tinytex_download.py

@@ -6,22 +6,11 @@
 import pytinytex
 
 @pytest.fixture(scope="module")
-def download_tinytex_0():
+def download_tinytex():
 	yield pytinytex.download_tinytex(variation=0, target_folder=os.path.join("tests", "tinytex_distribution"), download_folder="tests")
 	cleanup()
 
 
-@pytest.fixture(scope="module")
-def download_tinytex_1():
-	yield pytinytex.download_tinytex(variation=1, target_folder=os.path.join("tests", "tinytex_distribution"), download_folder="tests")
-	cleanup()
-
-@pytest.fixture(scope="module")
-def download_tinytex_2():
-	yield pytinytex.download_tinytex(variation=2, target_folder=os.path.join("tests", "tinytex_distribution"), download_folder="tests")
-	cleanup()
-
-
 def cleanup():
 	shutil.rmtree(os.path.join("tests", "tinytex_distribution"))
 	for item in os.listdir("tests"):