Merge branch 'master' into 1725-extend-datastore

ckan · May 29, 2014 · fafeef9 · fafeef9
2 parents 5854436 + 973d982
commit fafeef9
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py
@@ -823,7 +823,6 @@ class TestPep8(object):
         'ckanext/reclinepreview/plugin.py',
         'ckanext/reclinepreview/tests/test_preview.py',
         'ckanext/resourceproxy/plugin.py',
-        'ckanext/resourceproxy/tests/test_proxy.py',
         'ckanext/stats/controller.py',
         'ckanext/stats/plugin.py',
         'ckanext/stats/stats.py',
@@ -895,7 +894,7 @@ def find_pep8_errors(cls, filename=None, lines=None):
 
     @classmethod
     def _is_test(cls, filename):
-        return not not re.search('(^|\W)test_.*\.py', filename, re.IGNORECASE)
+        return bool(re.search('(^|\W)test_.*\.py$', filename, re.IGNORECASE))
 
 
 class TestActionAuth(object):