diff --git a/testing/resources/prints_cwd_repo/manifest.yaml b/testing/resources/prints_cwd_repo/manifest.yaml new file mode 100644 index 00000000..4a716c21 --- /dev/null +++ b/testing/resources/prints_cwd_repo/manifest.yaml @@ -0,0 +1,4 @@ +- id: prints_cwd + name: Prints Cwd + entry: prints_cwd + language: python diff --git a/testing/resources/prints_cwd_repo/prints_cwd/__init__.py b/testing/resources/prints_cwd_repo/prints_cwd/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/testing/resources/prints_cwd_repo/prints_cwd/main.py b/testing/resources/prints_cwd_repo/prints_cwd/main.py new file mode 100644 index 00000000..5e854ab1 --- /dev/null +++ b/testing/resources/prints_cwd_repo/prints_cwd/main.py @@ -0,0 +1,5 @@ +import os + +def func(): + print os.getcwd() + return 0 diff --git a/testing/resources/prints_cwd_repo/setup.py b/testing/resources/prints_cwd_repo/setup.py new file mode 100644 index 00000000..be840725 --- /dev/null +++ b/testing/resources/prints_cwd_repo/setup.py @@ -0,0 +1,11 @@ +from setuptools import find_packages +from setuptools import setup + +setup( + name='prints_cwd', + version='0.0.0', + packages=find_packages('.'), + entry_points={ + 'console_scripts': ['prints_cwd = prints_cwd.main:func'], + }, +) diff --git a/tests/conftest.py b/tests/conftest.py index f2ac3d6c..3b989779 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -32,37 +32,33 @@ def dummy_git_repo(empty_git_dir): yield empty_git_dir +def _make_repo(repo_path, repo_source): + copy_tree_to_path(get_resource_path(repo_source), repo_path) + add_and_commit() + return repo_path + + @pytest.yield_fixture def python_hooks_repo(dummy_git_repo): - copy_tree_to_path( - get_resource_path('python_hooks_repo'), - dummy_git_repo, - ) - add_and_commit() - yield dummy_git_repo + yield _make_repo(dummy_git_repo, 'python_hooks_repo') @pytest.yield_fixture def node_hooks_repo(dummy_git_repo): - copy_tree_to_path( - get_resource_path('node_hooks_repo'), - dummy_git_repo, - ) - add_and_commit() - yield dummy_git_repo + yield _make_repo(dummy_git_repo, 'node_hooks_repo') @pytest.yield_fixture def consumer_repo(dummy_git_repo): - copy_tree_to_path( - get_resource_path('consumer_repo'), - dummy_git_repo, - ) - add_and_commit() - yield dummy_git_repo + yield _make_repo(dummy_git_repo, 'consumer_repo') -@pytest.fixture +@pytest.yield_fixture +def prints_cwd_repo(dummy_git_repo): + yield _make_repo(dummy_git_repo, 'prints_cwd_repo') + + +@pytest.yield_fixture def config_for_node_hooks_repo(node_hooks_repo): config = { 'repo': node_hooks_repo, @@ -74,11 +70,10 @@ def config_for_node_hooks_repo(node_hooks_repo): } jsonschema.validate([config], CONFIG_JSON_SCHEMA) validate_config_extra([config]) - - return config + yield config -@pytest.fixture +@pytest.yield_fixture def config_for_python_hooks_repo(python_hooks_repo): config = { 'repo': python_hooks_repo, @@ -90,5 +85,19 @@ def config_for_python_hooks_repo(python_hooks_repo): } jsonschema.validate([config], CONFIG_JSON_SCHEMA) validate_config_extra([config]) + yield config - return config + +@pytest.yield_fixture +def config_for_prints_cwd_repo(prints_cwd_repo): + config = { + 'repo': prints_cwd_repo, + 'sha': git.get_head_sha(prints_cwd_repo), + 'hooks': [{ + 'id': 'prints_cwd', + 'files': '\.py$', + }], + } + jsonschema.validate([config], CONFIG_JSON_SCHEMA) + validate_config_extra([config]) + yield config diff --git a/tests/repository_test.py b/tests/repository_test.py index 0f3ccf35..35550b3b 100644 --- a/tests/repository_test.py +++ b/tests/repository_test.py @@ -5,6 +5,7 @@ import pytest import pre_commit.constants as C from pre_commit import git from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA +from pre_commit.clientlib.validate_config import validate_config_extra from pre_commit.repository import Repository @@ -28,13 +29,13 @@ def test_create_repo_in_env(dummy_repo_config, dummy_git_repo): ) @pytest.mark.integration -def test_install_python_repo_in_env(python_hooks_repo, config_for_python_hooks_repo): +def test_install_python_repo_in_env(config_for_python_hooks_repo): repo = Repository(config_for_python_hooks_repo) repo.install() assert os.path.exists( os.path.join( - python_hooks_repo, + repo.repo_url, C.HOOKS_WORKSPACE, repo.sha, 'py_env', @@ -61,6 +62,17 @@ def test_run_a_hook_lots_of_files(config_for_python_hooks_repo): assert ret[0] == 0 +@pytest.mark.xfail +@pytest.mark.integration +def test_cwd_of_hook(config_for_prints_cwd_repo): + repo = Repository(config_for_prints_cwd_repo) + repo.install() + ret = repo.run_hook('prints_cwd', []) + + assert ret[0] == 0 + assert ret[1] == '{0}\n'.format(repo.repo_url) + + @pytest.mark.skipif( os.environ.get('slowtests', None) == 'false', reason="TODO: make this test not super slow", @@ -74,6 +86,7 @@ def test_run_a_node_hook(config_for_node_hooks_repo): assert ret[0] == 0 assert ret[1] == 'Hello World\n' + @pytest.fixture def mock_repo_config(): config = { @@ -81,12 +94,11 @@ def mock_repo_config(): 'sha': '5e713f8878b7d100c0e059f8cc34be4fc2e8f897', 'hooks': [{ 'id': 'pyflakes', - 'files': '*.py', + 'files': '\.py$', }], } - jsonschema.validate([config], CONFIG_JSON_SCHEMA) - + validate_config_extra([config]) return config