Permalink
Browse files

Ignore .svn directories in the folders test from [17925]. This is wha…

…t happens when you use git-svn.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 3c5ff9d commit e7d648d8cbea71b7d9ffd6f0f7b2bfea3dbdf245 @alex alex committed Apr 22, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 tests/regressiontests/forms/tests/fields.py
View
6 tests/regressiontests/forms/tests/fields.py
@@ -982,9 +982,11 @@ def test_filepathfield_4(self):
self.assertTrue(got[0].endswith(exp[0]))
def test_filepathfield_folders(self):
+ skip_svn = r'[^(\.svn)]'
+
path = forms.__file__
path = os.path.dirname(path) + '/'
- f = FilePathField(path=path, allow_folders=True, allow_files=False)
+ f = FilePathField(path=path, allow_folders=True, allow_files=False, match=skip_svn)
f.choices.sort()
expected = [
('/django/forms/extras', 'extras'),
@@ -993,7 +995,7 @@ def test_filepathfield_folders(self):
self.assertEqual(exp[1], got[1])
self.assert_(got[0].endswith(exp[0]))
- f = FilePathField(path=path, allow_folders=True, allow_files=True)
+ f = FilePathField(path=path, allow_folders=True, allow_files=True, match=skip_svn)
f.choices.sort()
expected = [
('/django/forms/__init__.py', '__init__.py'),

0 comments on commit e7d648d

Please sign in to comment.