[1.6.x] Fixed #20933 -- Allowed loaddata to load fixtures from relative paths.

Backport of 6e846f7627ecf0dc15053624a23bfbf47535972d from master.

2 files changed, 16 insertions, 7 deletions

diff --git a/tests/fixtures_regress/models.py b/tests/fixtures_regress/models.py
index 7ba069ad08..ee93de2293 100644
--- a/tests/fixtures_regress/models.py
+++ b/tests/fixtures_regress/models.py
@@ -39,12 +39,6 @@ class Stuff(models.Model):
 class Absolute(models.Model):
     name = models.CharField(max_length=40)
 
-    load_count = 0
-
-    def __init__(self, *args, **kwargs):
-        super(Absolute, self).__init__(*args, **kwargs)
-        Absolute.load_count += 1
-
 
 class Parent(models.Model):
     name = models.CharField(max_length=10)
diff --git a/tests/fixtures_regress/tests.py b/tests/fixtures_regress/tests.py
index 1d0fb9e724..58339c9280 100644
--- a/tests/fixtures_regress/tests.py
+++ b/tests/fixtures_regress/tests.py
@@ -148,7 +148,22 @@ class TestFixtures(TestCase):
             load_absolute_path,
             verbosity=0,
         )
-        self.assertEqual(Absolute.load_count, 1)
+        self.assertEqual(Absolute.objects.count(), 1)
+
+    def test_relative_path(self):
+        directory = os.path.dirname(upath(__file__))
+        relative_path = os.path.join('fixtures', 'absolute.json')
+        cwd = os.getcwd()
+        try:
+            os.chdir(directory)
+            management.call_command(
+                'loaddata',
+                relative_path,
+                verbosity=0,
+            )
+        finally:
+            os.chdir(cwd)
+        self.assertEqual(Absolute.objects.count(), 1)
 
     def test_unknown_format(self):
         """