From c4783f49307f69fb843668a517efe50d2786d1cf Mon Sep 17 00:00:00 2001
From: Saugat Pachhai <suagatchhetri@outlook.com>
Date: Sat, 4 Jan 2020 19:18:51 +0545
Subject: [PATCH] test: merge _should_test_azure and _get_azure_url inside
 Azure class

---
 tests/func/test_data_cloud.py | 11 +++++------
 tests/remotes.py              | 33 +++++++++++++++------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/tests/func/test_data_cloud.py b/tests/func/test_data_cloud.py
index 9ee5599b71..8b163924b7 100644
--- a/tests/func/test_data_cloud.py
+++ b/tests/func/test_data_cloud.py
@@ -32,12 +32,12 @@
 
 from tests.remotes import (
     _should_test_aws,
-    _should_test_azure,
     _should_test_gcp,
     _should_test_gdrive,
     _should_test_hdfs,
     _should_test_oss,
     _should_test_ssh,
+    Azure,
     TEST_CONFIG,
     TEST_SECTION,
     TEST_GCP_CREDS_FILE,
@@ -45,7 +45,6 @@
     TEST_GDRIVE_CLIENT_SECRET,
     TEST_REMOTE,
     get_aws_url,
-    get_azure_url,
     get_gcp_url,
     get_gdrive_url,
     get_hdfs_url,
@@ -264,10 +263,10 @@ def _get_cloud_class(self):
 
 class TestRemoteAZURE(TestDataCloudBase):
     def _should_test(self):
-        return _should_test_azure()
+        return Azure.should_test()
 
     def _get_url(self):
-        return get_azure_url()
+        return Azure.get_url()
 
     def _get_cloud_class(self):
         return RemoteAZURE
@@ -535,10 +534,10 @@ def _test(self):
 
 class TestRemoteAZURECLI(TestDataCloudCLIBase):
     def _should_test(self):
-        return _should_test_azure()
+        return Azure.should_test()
 
     def _test(self):
-        url = get_azure_url()
+        url = Azure.get_url()
 
         self.main(["remote", "add", TEST_REMOTE, url])
 
diff --git a/tests/remotes.py b/tests/remotes.py
index 679f3f93b0..38ee20daff 100644
--- a/tests/remotes.py
+++ b/tests/remotes.py
@@ -84,16 +84,6 @@ def _should_test_gcp():
     return True
 
 
-def _should_test_azure():
-    do_test = env2bool("DVC_TEST_AZURE", undefined=None)
-    if do_test is not None:
-        return do_test
-
-    return os.getenv("AZURE_STORAGE_CONTAINER_NAME") and os.getenv(
-        "AZURE_STORAGE_CONNECTION_STRING"
-    )
-
-
 def _should_test_oss():
     do_test = env2bool("DVC_TEST_OSS", undefined=None)
     if do_test is not None:
@@ -205,12 +195,6 @@ def get_gcp_url():
     return "gs://" + get_gcp_storagepath()
 
 
-def get_azure_url():
-    container_name = os.getenv("AZURE_STORAGE_CONTAINER_NAME")
-    assert container_name is not None
-    return "azure://{}/{}".format(container_name, str(uuid.uuid4()))
-
-
 def get_oss_storagepath():
     return "{}/{}".format(TEST_OSS_REPO_BUCKET, (uuid.uuid4()))
 
@@ -271,8 +255,21 @@ def put_objects(remote, objects):
 
 
 class Azure:
-    should_test = staticmethod(_should_test_azure)
-    get_url = staticmethod(get_azure_url)
+    @staticmethod
+    def should_test():
+        do_test = env2bool("DVC_TEST_AZURE", undefined=None)
+        if do_test is not None:
+            return do_test
+
+        return os.getenv("AZURE_STORAGE_CONTAINER_NAME") and os.getenv(
+            "AZURE_STORAGE_CONNECTION_STRING"
+        )
+
+    @staticmethod
+    def get_url():
+        container_name = os.getenv("AZURE_STORAGE_CONTAINER_NAME")
+        assert container_name is not None
+        return "azure://{}/{}".format(container_name, str(uuid.uuid4()))
 
 
 class OSS: