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:
parent
3c5ff9d703
commit
e7d648d8cb
|
@ -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'),
|
||||
|
|
Loading…
Reference in New Issue