p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Alex Gaynor 2012-04-22 15:07:36 +00:00
parent 3c5ff9d703
commit e7d648d8cb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/regressiontests/forms/tests/fields.py
View File

@ -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'),