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

Fixed #14159 -- Corrected more potential uses of relative paths in tests. Thanks to Alex Gaynor for the patch. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-08-24 02:26:14 +00:00
parent 331bf80904
commit ce98a29eb7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -766,13 +766,13 @@ class FieldsTests(TestCase):
# FilePathField ###############################################################
def test_filepathfield_65(self):
path = forms.__file__
path = os.path.abspath(forms.__file__)
path = os.path.dirname(path) + '/'
assert fix_os_paths(path).endswith('/django/forms/')
self.assertTrue(fix_os_paths(path).endswith('/django/forms/'))
def test_filepathfield_66(self):
path = forms.__file__
path = os.path.dirname(path) + '/'
path = os.path.dirname(os.path.abspath(path)) + '/'
f = FilePathField(path=path)
f.choices = [p for p in f.choices if p[0].endswith('.py')]
f.choices.sort()
@ -787,13 +787,13 @@ class FieldsTests(TestCase):
]
for exp, got in zip(expected, fix_os_paths(f.choices)):
self.assertEqual(exp[1], got[1])
assert got[0].endswith(exp[0])
self.assertTrue(got[0].endswith(exp[0]))
self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. fields.py is not one of the available choices.']", f.clean, 'fields.py')
assert fix_os_paths(f.clean(path + 'fields.py')).endswith('/django/forms/fields.py')
def test_filepathfield_67(self):
path = forms.__file__
path = os.path.dirname(path) + '/'
path = os.path.dirname(os.path.abspath(path)) + '/'
f = FilePathField(path=path, match='^.*?\.py$')
f.choices.sort()
expected = [
@ -807,10 +807,10 @@ class FieldsTests(TestCase):
]
for exp, got in zip(expected, fix_os_paths(f.choices)):
self.assertEqual(exp[1], got[1])
assert got[0].endswith(exp[0])
self.assertTrue(got[0].endswith(exp[0]))
def test_filepathfield_68(self):
path = forms.__file__
path = os.path.abspath(forms.__file__)
path = os.path.dirname(path) + '/'
f = FilePathField(path=path, recursive=True, match='^.*?\.py$')
f.choices.sort()
@ -827,7 +827,7 @@ class FieldsTests(TestCase):
]
for exp, got in zip(expected, fix_os_paths(f.choices)):
self.assertEqual(exp[1], got[1])
assert got[0].endswith(exp[0])
self.assertTrue(got[0].endswith(exp[0]))
# SplitDateTimeField ##########################################################