From b57077af11ae287941b4d2939071fda2ad01f483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Rowlands=20=28=EB=B3=80=EA=B8=B0=ED=98=B8=29?=
 <peter@pmrowla.com>
Date: Fri, 5 Jun 2020 15:36:47 +0900
Subject: [PATCH] remote: fix remaining gdrive build issues (#3959)

* tests: fix gdrive build

* remote.gdrive: fix walk_files prefix relpath
---
 dvc/remote/gdrive.py | 5 +++--
 tests/remotes.py     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dvc/remote/gdrive.py b/dvc/remote/gdrive.py
index 8983e761c..0204a8997 100644
--- a/dvc/remote/gdrive.py
+++ b/dvc/remote/gdrive.py
@@ -537,8 +537,9 @@ class GDriveRemoteTree(BaseRemoteTree):
         if path_info == self.path_info:
             prefix = None
         else:
-            prefix = path_info.relative_to(self.path_info).path
-        return self._list_paths(prefix=prefix, **kwargs)
+            prefix = path_info.path
+        for fname in self._list_paths(prefix=prefix, **kwargs):
+            yield path_info.replace(fname)
 
     def remove(self, path_info):
         item_id = self._get_item_id(path_info)
diff --git a/tests/remotes.py b/tests/remotes.py
index 1a3c66b33..a5ce43a30 100644
--- a/tests/remotes.py
+++ b/tests/remotes.py
@@ -150,7 +150,7 @@ class GDrive:
             "gdrive_use_service_account": True,
         }
         remote = GDriveRemote(dvc, config)
-        remote._gdrive_create_dir("root", remote.path_info.path)
+        remote.tree._gdrive_create_dir("root", remote.path_info.path)
 
     @staticmethod
     def get_url():