From 433d2f8017794cb3c694cd94503d3794e3fbae3b Mon Sep 17 00:00:00 2001
From: Saugat Pachhai <suagatchhetri@outlook.com>
Date: Sat, 30 Nov 2019 19:12:35 +0545
Subject: [PATCH] test: remove nested contextmanagers, return False on exists()

---
 dvc/remote/gs.py |  2 ++
 tests/remotes.py | 48 ++++++++++++++++++------------------------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/dvc/remote/gs.py b/dvc/remote/gs.py
index 35477e1fd..2fd8b492a 100644
--- a/dvc/remote/gs.py
+++ b/dvc/remote/gs.py
@@ -173,6 +173,8 @@ class RemoteGS(RemoteBASE):
             if path_info.path == fname:
                 return True
 
+        return False
+
     def _upload(self, from_file, to_info, name=None, no_progress_bar=True):
         bucket = self.gs.bucket(to_info.bucket)
         _upload_to_bucket(
diff --git a/tests/remotes.py b/tests/remotes.py
index 3fdfae3f8..b9f170d32 100644
--- a/tests/remotes.py
+++ b/tests/remotes.py
@@ -235,26 +235,20 @@ class S3Mocked:
     get_url = staticmethod(get_aws_url)
 
     @classmethod
+    @contextmanager
     def remote(cls):
-        @contextmanager
-        def inner():
-            with mock_s3():
-                remote = RemoteS3(None, {"url": cls.get_url()})
-                yield remote
-
-        return inner()
+        with mock_s3():
+            remote = RemoteS3(None, {"url": cls.get_url()})
+            yield remote
 
     @classmethod
+    @contextmanager
     def put_objects(cls, remote, objects):
-        @contextmanager
-        def inner():
-            s3 = cls.get_client(remote)
-            s3.create_bucket(Bucket="dvc-test")
-            for key, body in objects.items():
-                cls.put_object(remote, key, body)
-            yield
-
-        return inner()
+        s3 = cls.get_client(remote)
+        s3.create_bucket(Bucket="dvc-test")
+        for key, body in objects.items():
+            cls.put_object(remote, key, body)
+        yield
 
     @staticmethod
     def get_client(remote):
@@ -275,24 +269,18 @@ class GCP:
     get_url = staticmethod(get_gcp_url)
 
     @classmethod
+    @contextmanager
     def remote(cls):
-        @contextmanager
-        def inner():
-            remote = RemoteGS(None, {"url": cls.get_url()})
-            yield remote
-
-        return inner()
+        remote = RemoteGS(None, {"url": cls.get_url()})
+        yield remote
 
     @classmethod
+    @contextmanager
     def put_objects(cls, remote, objects):
-        @contextmanager
-        def inner():
-            for key, body in objects.items():
-                cls.put_object(remote, key, body)
-            yield
-            cls.remove(remote, objects.keys())
-
-        return inner()
+        for key, body in objects.items():
+            cls.put_object(remote, key, body)
+        yield
+        cls.remove(remote, objects.keys())
 
     @classmethod
     def put_object(cls, remote, key, body):