Skip tests that need aws credentials by default

oggm/tests/__init__.py

@@ -47,6 +47,7 @@
 RUN_GRAPHIC_TESTS = True
 RUN_BENCHMARK_TESTS = True
 RUN_PERFORMANCE_TESTS = False
+RUN_CREDENTIAL_TESTS = False
 if os.environ.get('TRAVIS') is not None:
     # specific to travis to reduce global test time
     ON_TRAVIS = True
@@ -118,6 +119,8 @@
     RUN_SLOW_TESTS = True
 if os.environ.get('OGGM_DOWNLOAD_TESTS') is not None:
     RUN_DOWNLOAD_TESTS = True
+if os.environ.get('OGGM_CREDENTIAL_TESTS') is not None:
+    RUN_CREDENTIAL_TESTS = True
 
 # quick n dirty method to see if internet is on
 try:
@@ -163,3 +166,9 @@ def is_performance_test(test):
     # Test decorator
     msg = "requires explicit environment for performance tests"
     return test if RUN_PERFORMANCE_TESTS else unittest.skip(msg)(test)
+
+
+def is_download_cred(test):
+    # Test decorator
+    msg = "requires explicit environment for download and credential tests (AWS)"
+    return test if RUN_CREDENTIAL_TESTS and RUN_DOWNLOAD_TESTS else unittest.skip(msg)(test)

oggm/tests/test_utils.py

@@ -15,7 +15,7 @@
 import oggm
 from oggm import utils
 from oggm import cfg
-from oggm.tests import is_download
+from oggm.tests import is_download, is_download_cred
 from oggm.tests.funcs import get_test_dir, patch_url_retrieve_github, init_hef
 from oggm.utils import shape_factor_adhikari
 _url_retrieve = None
@@ -760,7 +760,7 @@ def test_srtmdownloadfails(self):
         zone = '41_20'
         self.assertTrue(utils._download_srtm_file(zone) is None)
 
-    @is_download
+    @is_download_cred
     def test_asterdownload(self):
 
         # this zone does exist and file should be small enough for download
@@ -780,7 +780,7 @@ def test_iceland(self):
         fp, z = utils.get_topo_file([-20, -20], [65, 65])
         self.assertTrue(os.path.exists(fp[0]))
 
-    @is_download
+    @is_download_cred
     def test_asterdownloadfails(self):
 
         # this zone does not exist