Rearrange tests.

Author: domdfcoding

formate.toml

@@ -32,6 +32,7 @@ use_parentheses = true
 remove_redundant_aliases = true
 default_section = "THIRDPARTY"
 known_third_party = [
+    "backports_entry_points_selectable",
     "coincidence",
     "coverage",
     "coverage_pyver_pragma",

repo_helper.yml

@@ -10,7 +10,7 @@ version: '0.1.0'
 license: 'MIT'
 short_desc: '(experimental) Allows hooks to be defined which are called when recreating a tox testenv.'
 
-min_coverage: 90
+min_coverage: 100
 use_whey: true
 enable_conda: False
 sphinx_html_theme: furo

tests/requirements.txt

@@ -1,9 +1,9 @@
+git+https://github.com/python-coincidence/testing-tox
+backports-entry-points-selectable>=1.0.2
 coincidence>=0.2.0
 coverage>=5.1
 coverage-pyver-pragma>=0.2.1
-domdf-python-tools[testing]>=2.0.1
-iniconfig!=1.1.0,>=1.0.1
 pytest>=6.0.0
 pytest-cov>=2.8.1
-pytest-randomly>=3.3.1
+pytest-randomly>=3.6.0
 pytest-timeout>=1.4.2

tests/test_hooks.py

@@ -1,49 +1,44 @@
-# stdlib
-import sys
-
 # 3rd party
 import pytest
-import tox  # type: ignore
-import tox.reporter  # type: ignore
 from coincidence.selectors import not_pypy
-from domdf_python_tools.paths import in_directory
-
+from testing_tox import run_tox
 
-def test_rmdir_docs(tmp_pathplus, capsys):
-	tox.reporter._INSTANCE.tw._file = sys.stdout
 
+@pytest.fixture()
+def basic_docs_testenv(tmp_pathplus):
 	build_dir = tmp_pathplus / "doc-source" / "build"
-
 	build_dir.mkdir(parents=True)
 
 	(tmp_pathplus / "tox.ini").write_lines([
 			"[testenv:docs]",
 			"deps = sphinx",
 			"skip_install = True",
 			"commands = sphinx-build --version",
-			'recreate_hook = builtin.rmdir(r"{toxinidir}/doc-source/build")',
 			])
 
-	try:
-		with pytest.raises(SystemExit), in_directory(tmp_pathplus):
-			tox.cmdline(["-e", "docs", "-r"])
+	return build_dir
 
+
+def test_rmdir_docs(basic_docs_testenv, tmp_pathplus, capsys):
+	with (tmp_pathplus / "tox.ini").open('a') as fp:
+		fp.write('recreate_hook = builtin.rmdir(r"{toxinidir}/doc-source/build")\n')
+
+	try:
+		run_tox(["-e", "docs", "-r"], tmp_pathplus)
 	finally:
 		stdout = capsys.readouterr().out
 		print(stdout)
 
 	assert (tmp_pathplus / "doc-source").is_dir()
-	assert not build_dir.is_dir()
+	assert not basic_docs_testenv.is_dir()
 
-	assert f"docs recreate hook: removing {build_dir}" in stdout
+	assert f"docs recreate hook: removing {basic_docs_testenv}" in stdout
 
 
 @not_pypy("mypy does noy support PyPy")
 def test_rmdir_mypy(tmp_pathplus, capsys):
-	tox.reporter._INSTANCE.tw._file = sys.stdout
 
 	cache_dir = tmp_pathplus / ".mypy_cache"
-
 	cache_dir.mkdir()
 
 	(tmp_pathplus / "tox.ini").write_lines([
@@ -55,127 +50,70 @@ def test_rmdir_mypy(tmp_pathplus, capsys):
 			])
 
 	try:
-		with pytest.raises(SystemExit), in_directory(tmp_pathplus):
-			tox.cmdline(["-e", "mypy", "-r"])
-
+		run_tox(["-e", "mypy", "-r"], tmp_pathplus)
 	finally:
 		stdout = capsys.readouterr().out
 		print(stdout)
 
-	stdout = capsys.readouterr().out
-	print(stdout)
-
 	assert not cache_dir.is_dir()
 
 	assert f"mypy recreate hook: removing {cache_dir}" in stdout
 
 
-def test_simple_custom_hook(tmp_pathplus, capsys):
-	tox.reporter._INSTANCE.tw._file = sys.stdout
-
-	(tmp_pathplus / "tox.ini").write_lines([
-			"[testenv:docs]",
-			"deps = sphinx",
-			"skip_install = True",
-			"commands = sphinx-build --version",
-			'recreate_hook = "hello world"',
-			])
+def test_simple_custom_hook(basic_docs_testenv, tmp_pathplus, capsys):
+	with (tmp_pathplus / "tox.ini").open('a') as fp:
+		fp.write('recreate_hook = "hello world"')
 
 	try:
-		with pytest.raises(SystemExit), in_directory(tmp_pathplus):
-			tox.cmdline(["-e", "docs", "-r"])
-
+		run_tox(["-e", "docs", "-r"], tmp_pathplus)
 	finally:
 		stdout = capsys.readouterr().out
 		print(stdout)
 
-	stdout = capsys.readouterr().out
-	print(stdout)
-
 	assert f"docs recreate hook: hello world" in stdout
 
 
-def test_custom_hook(tmp_pathplus, capsys):
-	tox.reporter._INSTANCE.tw._file = sys.stdout
-
-	(tmp_pathplus / "tox.ini").write_lines([
-			"[testenv:docs]",
-			"deps = sphinx",
-			"skip_install = True",
-			"commands = sphinx-build --version",
-			"recreate_hook = custom_hook.custom_hook()",
-			])
+def test_custom_hook(basic_docs_testenv, tmp_pathplus, capsys):
+	with (tmp_pathplus / "tox.ini").open('a') as fp:
+		fp.write('recreate_hook = custom_hook.custom_hook()\n')
 
 	(tmp_pathplus / "custom_hook.py").write_lines([
 			"def custom_hook() -> str:",
 			'\treturn "this is a custom hook"',
 			])
 
 	try:
-		with pytest.raises(SystemExit), in_directory(tmp_pathplus):
-			tox.cmdline(["-e", "docs", "-r"])
-
+		run_tox(["-e", "docs", "-r"], tmp_pathplus)
 	finally:
 		stdout = capsys.readouterr().out
 		print(stdout)
 
-	stdout = capsys.readouterr().out
-	print(stdout)
-
 	assert f"docs recreate hook: this is a custom hook" in stdout
 
 
-def test_no_hook(tmp_pathplus, capsys):
-	tox.reporter._INSTANCE.tw._file = sys.stdout
-
-	(tmp_pathplus / "tox.ini").write_lines([
-			"[testenv:docs]",
-			"deps = sphinx",
-			"skip_install = True",
-			"commands = sphinx-build --version",
-			])
+def test_no_hook(basic_docs_testenv, tmp_pathplus, capsys):
 
 	try:
-		with pytest.raises(SystemExit), in_directory(tmp_pathplus):
-			tox.cmdline(["-e", "docs", "-r"])
+		run_tox(["-e", "docs", "-r"], tmp_pathplus)
 
 	finally:
 		stdout = capsys.readouterr().out
 		print(stdout)
 
-	stdout = capsys.readouterr().out
-	print(stdout)
-
 	assert "docs recreate hook: " not in stdout
 
 
-def test_not_recreate(tmp_pathplus, capsys):
-	tox.reporter._INSTANCE.tw._file = sys.stdout
-
-	build_dir = tmp_pathplus / "doc-source" / "build"
-
-	build_dir.mkdir(parents=True)
-
-	(tmp_pathplus / "tox.ini").write_lines([
-			"[testenv:docs]",
-			"deps = sphinx",
-			"skip_install = True",
-			"commands = sphinx-build --version",
-			'recreate_hook = builtin.rmdir(r"{toxinidir}/doc-source/build")',
-			])
+def test_not_recreate(basic_docs_testenv, tmp_pathplus, capsys):
+	with (tmp_pathplus / "tox.ini").open('a') as fp:
+		fp.write('recreate_hook = builtin.rmdir(r"{toxinidir}/doc-source/build")\n')
 
 	try:
-		with pytest.raises(SystemExit), in_directory(tmp_pathplus):
-			tox.cmdline(["-e", "docs"])
-
+		run_tox(["-e", "docs"], tmp_pathplus)
 	finally:
 		stdout = capsys.readouterr().out
 		print(stdout)
 
-	stdout = capsys.readouterr().out
-	print(stdout)
-
 	assert (tmp_pathplus / "doc-source").is_dir()
-	assert build_dir.is_dir()
+	assert basic_docs_testenv.is_dir()
 
 	assert "docs recreate hook: " not in stdout

tox.ini

@@ -135,7 +135,7 @@ min_python_version = 3.7
 plugins = coverage_pyver_pragma
 
 [coverage:report]
-fail_under = 90
+fail_under = 100
 exclude_lines =
     raise AssertionError
     raise NotImplementedError