diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ae4511f7..7af11c42 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,9 +39,6 @@ Alternatively, with the environment activated you can run all of the tests using: `py.test tests` -To skip the slower ruby / node integration tests, you can set the environment -variable `slowtests=false`. - ### Setting up the hooks With the environment activated simply run `pre-commit install`. diff --git a/testing/util.py b/testing/util.py index 8a5bfc4d..357968fb 100644 --- a/testing/util.py +++ b/testing/util.py @@ -32,11 +32,6 @@ skipif_cant_run_docker = pytest.mark.skipif( reason='Docker isn\'t running or can\'t be accessed', ) -skipif_slowtests_false = pytest.mark.skipif( - os.environ.get('slowtests') == 'false', - reason='slowtests=false', -) - skipif_cant_run_swift = pytest.mark.skipif( parse_shebang.find_executable('swift') is None, reason='swift isn\'t installed or can\'t be found', diff --git a/tests/make_archives_test.py b/tests/make_archives_test.py index 9a0f1e59..2cb62697 100644 --- a/tests/make_archives_test.py +++ b/tests/make_archives_test.py @@ -11,7 +11,6 @@ from pre_commit import make_archives from pre_commit.util import cmd_output from pre_commit.util import cwd from testing.fixtures import git_dir -from testing.util import skipif_slowtests_false def test_make_archive(tempdir_factory): @@ -50,7 +49,6 @@ def test_make_archive(tempdir_factory): assert not os.path.exists(os.path.join(extract_dir, 'foo', 'bar')) -@skipif_slowtests_false @pytest.mark.integration def test_main(tmpdir): make_archives.main(('--dest', tmpdir.strpath)) diff --git a/tests/repository_test.py b/tests/repository_test.py index f7c027cd..dd20dd0e 100644 --- a/tests/repository_test.py +++ b/tests/repository_test.py @@ -31,7 +31,6 @@ from testing.fixtures import modify_manifest from testing.util import get_resource_path from testing.util import skipif_cant_run_docker from testing.util import skipif_cant_run_swift -from testing.util import skipif_slowtests_false from testing.util import xfailif_no_pcre_support from testing.util import xfailif_windows_no_node from testing.util import xfailif_windows_no_ruby @@ -145,7 +144,6 @@ def test_versioned_python_hook(tempdir_factory, store): ) -@skipif_slowtests_false @skipif_cant_run_docker @pytest.mark.integration def test_run_a_docker_hook(tempdir_factory, store): @@ -156,7 +154,6 @@ def test_run_a_docker_hook(tempdir_factory, store): ) -@skipif_slowtests_false @skipif_cant_run_docker @pytest.mark.integration def test_run_a_docker_hook_with_entry_args(tempdir_factory, store): @@ -167,7 +164,6 @@ def test_run_a_docker_hook_with_entry_args(tempdir_factory, store): ) -@skipif_slowtests_false @skipif_cant_run_docker @pytest.mark.integration def test_run_a_failing_docker_hook(tempdir_factory, store): @@ -179,7 +175,6 @@ def test_run_a_failing_docker_hook(tempdir_factory, store): ) -@skipif_slowtests_false @skipif_cant_run_docker @pytest.mark.integration @pytest.mark.parametrize('hook_id', ('echo-entrypoint', 'echo-cmd')) @@ -191,7 +186,6 @@ def test_run_a_docker_image_hook(tempdir_factory, store, hook_id): ) -@skipif_slowtests_false @xfailif_windows_no_node @pytest.mark.integration def test_run_a_node_hook(tempdir_factory, store): @@ -201,7 +195,6 @@ def test_run_a_node_hook(tempdir_factory, store): ) -@skipif_slowtests_false @xfailif_windows_no_node @pytest.mark.integration def test_run_versioned_node_hook(tempdir_factory, store): @@ -211,7 +204,6 @@ def test_run_versioned_node_hook(tempdir_factory, store): ) -@skipif_slowtests_false @xfailif_windows_no_ruby @pytest.mark.integration def test_run_a_ruby_hook(tempdir_factory, store): @@ -221,7 +213,6 @@ def test_run_a_ruby_hook(tempdir_factory, store): ) -@skipif_slowtests_false @xfailif_windows_no_ruby @pytest.mark.integration def test_run_versioned_ruby_hook(tempdir_factory, store): @@ -233,7 +224,6 @@ def test_run_versioned_ruby_hook(tempdir_factory, store): ) -@skipif_slowtests_false @xfailif_windows_no_ruby @pytest.mark.integration def test_run_ruby_hook_with_disable_shared_gems( @@ -499,7 +489,6 @@ def test_additional_dependencies_roll_forward(tempdir_factory, store): assert 'mccabe' in output -@skipif_slowtests_false @xfailif_windows_no_ruby @pytest.mark.integration def test_additional_ruby_dependencies_installed( @@ -516,7 +505,6 @@ def test_additional_ruby_dependencies_installed( assert 'tins' in output -@skipif_slowtests_false @xfailif_windows_no_node @pytest.mark.integration def test_additional_node_dependencies_installed(