tests: adjust tests

tests/func/test_cache.py

@@ -1,6 +1,5 @@
 import os
 import stat
-from pathlib import Path
 
 import configobj
 import pytest
@@ -155,7 +154,7 @@ def test_abs_path(self):
         self.assertEqual(ret, 0)
 
         config = configobj.ConfigObj(self.dvc.config.files["repo"])
-        self.assertEqual(Path(config["cache"]["dir"]), Path(dname))
+        self.assertEqual(config["cache"]["dir"], dname.replace("\\", "/"))
 
     def test_relative_path(self):
         tmpdir = self.mkdtemp()
@@ -167,7 +166,7 @@ def test_relative_path(self):
         # dir path written to config should be just one level above.
         rel = os.path.join("..", dname)
         config = configobj.ConfigObj(self.dvc.config.files["repo"])
-        self.assertEqual(Path(config["cache"]["dir"]), Path(rel))
+        self.assertEqual(config["cache"]["dir"], rel.replace("\\", "/"))
 
         ret = main(["add", self.FOO])
         self.assertEqual(ret, 0)

tests/func/test_remote.py

@@ -1,18 +1,17 @@
 import errno
 import os
-import posixpath
 
 import configobj
 import pytest
 from mock import patch
 
-from dvc.compat import fspath
 from dvc.config import Config
 from dvc.exceptions import DownloadError, UploadError
 from dvc.main import main
 from dvc.path_info import PathInfo
 from dvc.remote import RemoteLOCAL
 from dvc.remote.base import RemoteBASE, RemoteCacheRequiredError
+from dvc.compat import fspath
 from dvc.utils.fs import remove
 from tests.basic_env import TestDvc
 from tests.remotes import Local
@@ -40,16 +39,17 @@ def test(self):
         self.assertEqual(main(["remote", "list"]), 0)
 
     def test_relative_path(self):
-        dname_parts = ["..", "path", "to", "dir"]
-        dname = os.path.join(*dname_parts)
+        dname = os.path.join("..", "path", "to", "dir")
         ret = main(["remote", "add", "mylocal", dname])
         self.assertEqual(ret, 0)
 
         # NOTE: we are in the repo's root and config is in .dvc/, so
         # dir path written to config should be just one level above.
-        rel = posixpath.join("..", *dname_parts)
+        rel = os.path.join("..", dname)
         config = configobj.ConfigObj(self.dvc.config.files["repo"])
-        self.assertEqual(config['remote "mylocal"']["url"], rel)
+        self.assertEqual(
+            config['remote "mylocal"']["url"], rel.replace("\\", "/")
+        )
 
     def test_overwrite(self):
         remote_name = "a"

tests/unit/test_config.py

@@ -0,0 +1,17 @@
+import os
+import pytest
+
+from dvc.config import Config
+
+
+@pytest.mark.parametrize(
+    "path, expected",
+    [
+        ("cache", "../cache"),
+        (os.path.join("..", "cache"), "../../cache"),
+        (os.getcwd(), os.getcwd().replace("\\", "/")),
+        ("ssh://some/path", "ssh://some/path"),
+    ],
+)
+def test_to_relpath(path, expected):
+    assert Config._to_relpath(os.path.join(".", "config"), path) == expected