diff --git a/tests/func/test_data_cloud.py b/tests/func/test_data_cloud.py index dd2b701544..c9eee21b5f 100644 --- a/tests/func/test_data_cloud.py +++ b/tests/func/test_data_cloud.py @@ -32,11 +32,11 @@ from tests.remotes import ( _should_test_aws, - _should_test_azure, _should_test_gcp, _should_test_hdfs, _should_test_oss, _should_test_ssh, + Azure, GDrive, TEST_CONFIG, TEST_SECTION, @@ -45,7 +45,6 @@ TEST_GDRIVE_CLIENT_SECRET, TEST_REMOTE, get_aws_url, - get_azure_url, get_gcp_url, get_hdfs_url, get_local_url, @@ -263,10 +262,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 @@ -534,10 +533,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 5923439228..f2623b2d41 100644 --- a/tests/remotes.py +++ b/tests/remotes.py @@ -77,16 +77,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: @@ -194,12 +184,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())) @@ -268,8 +252,21 @@ def get_url(): 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: