Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/db/backends/mysql/base.py
	django/db/backends/postgresql_psycopg2/base.py

2 files changed, 27 insertions, 0 deletions

diff --git a/tests/regressiontests/utils/os_utils.py b/tests/regressiontests/utils/os_utils.py
new file mode 100644
index 0000000000..a205d67431
--- /dev/null
+++ b/tests/regressiontests/utils/os_utils.py
@@ -0,0 +1,26 @@
+import os
+
+from django.utils import unittest
+from django.utils._os import safe_join
+
+
+class SafeJoinTests(unittest.TestCase):
+    def test_base_path_ends_with_sep(self):
+        drive, path = os.path.splitdrive(safe_join("/abc/", "abc"))
+        self.assertEqual(
+            path,
+            "{0}abc{0}abc".format(os.path.sep)
+        )
+
+    def test_root_path(self):
+        drive, path = os.path.splitdrive(safe_join("/", "path"))
+        self.assertEqual(
+            path,
+            "{0}path".format(os.path.sep),
+        )
+
+        drive, path = os.path.splitdrive(safe_join("/", ""))
+        self.assertEqual(
+            path,
+            os.path.sep,
+        )
diff --git a/tests/regressiontests/utils/tests.py b/tests/regressiontests/utils/tests.py
index f4fa75b177..061c669eb7 100644
--- a/tests/regressiontests/utils/tests.py
+++ b/tests/regressiontests/utils/tests.py
@@ -21,6 +21,7 @@ from .http import TestUtilsHttp
 from .ipv6 import TestUtilsIPv6
 from .jslex import JsToCForGettextTest, JsTokensTest
 from .module_loading import CustomLoader, DefaultLoader, EggLoader
+from .os_utils import SafeJoinTests
 from .regex_helper import NormalizeTests
 from .simplelazyobject import TestUtilsSimpleLazyObject
 from .termcolors import TermColorTests