From 77e61f40be189646ae39c6a4d36fca4577578d32 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 14 Feb 2018 13:57:26 +0200 Subject: [PATCH] test: test AWS on appveyor Signed-off-by: Ruslan Kuprieiev --- .appveyor.yml | 6 ++++++ tests/test_data_cloud.py | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3645702c9..25fc9b22c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,6 +5,12 @@ branches: platform: x86 environment: + my_variable: + aws_access_key_id: + secure: N3zfVSEvKhLSg/wvtrT1ZIVl9/egvW6xqIoRDrOcvvrkvJM0VejDHb3R3BWUUftY + aws_secret_access_key: + secure: /XGu3uYneji4fwIaFIEzDln9bx7vWZiLb6yie1temPyIRK+NQlvyfGXHcKZ5Vm4teaG68pNvQKoYulUSem4NvQ== + matrix: - PYTHON: "C:\\Python27" diff --git a/tests/test_data_cloud.py b/tests/test_data_cloud.py index a16f2f0c4..d47c5f314 100644 --- a/tests/test_data_cloud.py +++ b/tests/test_data_cloud.py @@ -99,12 +99,15 @@ class TestDataCloudAWS(TestDataCloudBase): TEST_REPO_REGION = 'us-east-2' def _should_test(self): - if os.name == 'nt': + dvc_test_aws = os.getenv("DVC_TEST_AWS") + if dvc_test_aws == "true": + return True + elif dvc_test_aws == "false": return False - if os.getenv("TRAVIS_PULL_REQUEST") == "false" and \ - os.getenv("TRAVIS_SECURE_ENV_VARS") == "true": + if os.getenv("AWS_ACCESS_KEY_ID") and os.getenv("AWS_SECRET_ACCESS_KEY"): return True + return False def _setup_cloud(self): @@ -129,12 +132,10 @@ class TestDataCloudGCP(TestDataCloudBase): TEST_REPO_GCP_PROJECT='dvc-project' def _should_test(self): - if os.name == 'nt': - return False + if os.getenv("DVC_TEST_GCP") == "true": + return True - if os.getenv("TRAVIS") == "true" or os.getenv("APPVEYOR") == "True" or os.getenv("DVC_TEST_GCP") != "true": - return False - return True + return False def _setup_cloud(self): if not self._should_test():