diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2012-04-22 15:07:36 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2012-04-22 15:07:36 +0000 |
| commit | e7d648d8cbea71b7d9ffd6f0f7b2bfea3dbdf245 (patch) | |
| tree | 21e9e9754991bf4d708f8d02eb8a08d09babee19 | |
| parent | 3c5ff9d703be67b43655c5a40e8ee3719ad2871b (diff) | |
Ignore .svn directories in the folders test from [17925]. This is what happens when you use git-svn.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | tests/regressiontests/forms/tests/fields.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/regressiontests/forms/tests/fields.py b/tests/regressiontests/forms/tests/fields.py index 4e942a1ca7..a941cd36af 100644 --- a/tests/regressiontests/forms/tests/fields.py +++ b/tests/regressiontests/forms/tests/fields.py @@ -982,9 +982,11 @@ class FieldsTests(SimpleTestCase): 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 @@ class FieldsTests(SimpleTestCase): 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'), |