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

Fixed #23612 -- Normalized fixuture paths to allow referencing relative paths on Windows.

This commit is contained in:
Brandon Taylor 2014-10-07 13:53:19 -04:00 committed by Tim Graham
parent 92a17eaae0
commit 16ed35fafc
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/management/commands/loaddata.py
View File

@ -186,7 +186,7 @@ class Command(BaseCommand):
fixture_name = os.path.basename(fixture_name) fixture_name = os.path.basename(fixture_name)
else: else:
fixture_dirs = self.fixture_dirs fixture_dirs = self.fixture_dirs
if os.path.sep in fixture_name: if os.path.sep in os.path.normpath(fixture_name):
fixture_dirs = [os.path.join(dir_, os.path.dirname(fixture_name)) fixture_dirs = [os.path.join(dir_, os.path.dirname(fixture_name))
for dir_ in fixture_dirs] for dir_ in fixture_dirs]
fixture_name = os.path.basename(fixture_name) fixture_name = os.path.basename(fixture_name)

12
tests/fixtures_regress/tests.py
View File

@ -857,3 +857,15 @@ class TestTicket11101(TransactionTestCase):
self.assertEqual(Thingy.objects.count(), 1) self.assertEqual(Thingy.objects.count(), 1)
transaction.set_rollback(True) transaction.set_rollback(True)
self.assertEqual(Thingy.objects.count(), 0) self.assertEqual(Thingy.objects.count(), 0)
class TestLoadFixtureFromOtherAppDirectory(TestCase):
"""
#23612 -- fixtures path should be normalized to allow referencing relative
paths on Windows.
"""
fixtures = ['fixtures_regress/fixtures/absolute.json']
def test_fixtures_loaded(self):
count = Absolute.objects.count()
self.assertGreater(count, 0, "Fixtures not loaded properly.")