pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-06 12:06:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #89 from phoxelua/master

Browse source 
Fixed regex matching for django test file names
This commit is contained in:
Anthony Sottile 2015-11-19 06:43:08 -08:00
commit 0ff8620e03
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pre_commit_hooks/tests_should_end_in_test.py
View file

@ -3,6 +3,7 @@ from __future__ import print_function
import argparse import argparse
import re import re
import sys import sys
from os.path import basename
def validate_files(argv=None): def validate_files(argv=None):
@ -15,14 +16,13 @@ def validate_files(argv=None):
args = parser.parse_args(argv) args = parser.parse_args(argv)
retcode = 0 retcode = 0
test_name_pattern = '.*_test.py' test_name_pattern = 'test_.*.py' if args.django else '.*_test.py'
if args.django:
test_name_pattern = 'test.*.py'
for filename in args.filenames: for filename in args.filenames:
base = basename(filename)
if ( if (
not re.match(test_name_pattern, filename) and not re.match(test_name_pattern, base) and
not filename.endswith('__init__.py') and not base == '__init__.py' and
not filename.endswith('/conftest.py') not base == 'conftest.py'
): ):
retcode = 1 retcode = 1
print( print(

7
tests/tests_should_end_in_test_test.py
View file

@ -12,7 +12,7 @@ def test_validate_files_one_fails():
def test_validate_files_django_all_pass(): def test_validate_files_django_all_pass():
ret = validate_files(['--django', 'test_foo.py', 'test_bar.py']) ret = validate_files(['--django', 'test_foo.py', 'test_bar.py', 'tests/test_baz.py'])
assert ret == 0 assert ret == 0
@ -21,6 +21,11 @@ def test_validate_files_django_one_fails():
assert ret == 1 assert ret == 1
def test_validate_nested_files_django_one_fails():
ret = validate_files(['--django', 'tests/not_test_ending.py', 'test_foo.py'])
assert ret == 1
def test_validate_files_not_django_fails(): def test_validate_files_not_django_fails():
ret = validate_files(['foo_test.py', 'bar_test.py', 'test_baz.py']) ret = validate_files(['foo_test.py', 'bar_test.py', 'test_baz.py'])
assert ret == 1 assert ret == 1