Add more test decorators (#669)

Not sure if this is accepted but some tests fail locally when
credentials/env variables are not set.
I see that there are already decorators for this purpose, this PR
extends those decorators.

Author: aminalaee

tests/api/test_commands.py

@@ -17,7 +17,7 @@
 from mlem.core.model import ModelIO
 from mlem.core.objects import MAIN_PROCESSOR_NAME, MlemLink, MlemModel
 from mlem.runtime.client import HTTPClient
-from tests.conftest import MLEM_TEST_REPO, long
+from tests.conftest import MLEM_TEST_REPO, long, need_aws_auth
 
 IMPORT_MODEL_FILENAME = "mymodel"
 
@@ -120,6 +120,7 @@ def test_init(tmpdir):
 
 
 @long
+@need_aws_auth
 def test_init_remote(s3_tmp_path, s3_storage_fs):
     path = s3_tmp_path("init")
     init(path)
@@ -205,6 +206,7 @@ def test_import_model_pickle__no_copy_in_mlem_project(
 
 
 @long
+@need_aws_auth
 def test_import_model_pickle_remote(
     s3_tmp_path, s3_storage_fs, write_model_pickle, tmpdir, train
 ):
@@ -223,6 +225,7 @@ def test_import_model_pickle_remote(
 
 
 @long
+@need_aws_auth
 def test_import_model_pickle_remote_in_project(
     s3_tmp_path, s3_storage_fs, write_model_pickle, train
 ):

tests/conftest.py

@@ -4,6 +4,7 @@
 from pathlib import Path
 from typing import Any, Callable, Set, Type
 
+import boto3
 import git
 import numpy as np
 import pandas as pd
@@ -75,6 +76,11 @@ def _check_github_test_repo_auth():
     reason="No ssh credentials for remote repo",
 )
 
+need_aws_auth = pytest.mark.skipif(
+    boto3.Session().get_credentials() is None,
+    reason="AWS credentials missing",
+)
+
 
 def get_current_test_branch(branch_list: Set[str]):
     try:

tests/contrib/test_bitbucket.py

@@ -19,7 +19,7 @@
 def fs_no_auth():
     username = os.environ.get("BITBUCKET_USERNAME", None)
     try:
-        del os.environ["BITBUCKET_USERNAME"]
+        os.environ.pop("BITBUCKET_USERNAME", None)
         yield BitBucketFileSystem(MLEM_TEST_REPO_PROJECT)
     finally:
         if username:

tests/contrib/test_heroku.py

@@ -217,6 +217,7 @@ def no_heroku_env():
         HEROKU_CONFIG.API_KEY = conf_tmp
 
 
+@heroku
 def test_suggest_login(no_heroku_env, heroku_app_name, heroku_env):
     with pytest.raises(
         DeploymentError,

tests/contrib/test_pandas.py

@@ -46,7 +46,7 @@
 from mlem.core.model import Signature
 from mlem.core.objects import MlemData
 from mlem.utils.module import get_object_requirements
-from tests.conftest import data_write_read_check, long
+from tests.conftest import data_write_read_check, long, need_aws_auth
 
 PD_DATA_FRAME = pd.DataFrame(
     [
@@ -527,6 +527,7 @@ def test_import_data_stata(tmpdir, data):
 
 
 @long
+@need_aws_auth
 def test_import_data_csv_remote(s3_tmp_path, s3_storage_fs, write_csv):
     project_path = s3_tmp_path("test_csv_import")
     path = posixpath.join(project_path, "data.csv")

tests/core/test_artifacts.py

@@ -10,10 +10,11 @@
     LocalArtifact,
     LocalStorage,
 )
-from tests.conftest import long, resource_path
+from tests.conftest import long, need_aws_auth, resource_path
 
 
 @long
+@need_aws_auth
 def test_fsspec_backend_s3_upload(tmpdir, s3_tmp_path, s3_storage):
     target = os.path.basename(s3_tmp_path("upload"))
     resource = resource_path(__file__, "file.txt")
@@ -30,6 +31,7 @@ def test_fsspec_backend_s3_upload(tmpdir, s3_tmp_path, s3_storage):
 
 
 @long
+@need_aws_auth
 def test_fsspec_backend_s3_open(s3_tmp_path, s3_storage):
     target = os.path.basename(s3_tmp_path("open"))
     with s3_storage.open(target) as (f, artifact):

tests/core/test_metadata.py

@@ -33,6 +33,7 @@
     MLEM_TEST_REPO_NAME,
     MLEM_TEST_REPO_ORG,
     long,
+    need_aws_auth,
     need_test_repo_auth,
     need_test_repo_ssh_auth,
 )
@@ -96,6 +97,7 @@ def test_model_loading(model_path):
 
 @long
 @need_test_repo_ssh_auth
+@need_aws_auth
 def test_model_loading_remote_dvc(current_test_branch):
     model = load(
         f"{MLEM_TEST_REPO}/dvc_pipeline/data/model",
@@ -170,6 +172,7 @@ def test_load_link_with_fsspec_path(current_test_branch):
 
 
 @long
+@need_aws_auth
 def test_saving_to_s3(model, s3_storage_fs, s3_tmp_path):
     path = s3_tmp_path("model_save")
     init(path)
@@ -182,6 +185,7 @@ def test_saving_to_s3(model, s3_storage_fs, s3_tmp_path):
 
 
 @long
+@need_aws_auth
 def test_loading_from_s3(model, s3_storage_fs, s3_tmp_path):
     path = s3_tmp_path("model_load")
     init(path)
@@ -252,6 +256,7 @@ def test_ls_remote(current_test_branch):
 
 
 @long
+@need_aws_auth
 def test_ls_remote_s3(s3_tmp_path):
     path = s3_tmp_path("ls_remote_s3")
     init(path)

tests/core/test_objects.py

@@ -32,6 +32,7 @@
     MLEM_TEST_REPO,
     flaky,
     long,
+    need_aws_auth,
     need_test_repo_auth,
     need_test_repo_ssh_auth,
 )
@@ -194,6 +195,7 @@ def test_model_cloning_to_project(model_single_path, mlem_project):
 
 
 @long
+@need_aws_auth
 def test_model_cloning_to_remote(model_path, s3_tmp_path, s3_storage_fs):
     model = load_meta(model_path)
     path = s3_tmp_path("model_cloning_to_remote")

tests/test_config.py

@@ -5,7 +5,7 @@
 from mlem.contrib.fastapi import FastAPIServer
 from mlem.core.artifacts import FSSpecStorage, LocalStorage
 from mlem.core.meta_io import get_fs
-from tests.conftest import long
+from tests.conftest import long, need_aws_auth
 
 
 def test_loading_storage(set_mlem_project_root):
@@ -21,6 +21,7 @@ def test_loading_empty(set_mlem_project_root):
     assert isinstance(config.storage, LocalStorage)
 
 
+@need_aws_auth
 @long
 def test_loading_remote(s3_tmp_path, s3_storage_fs):
     project = s3_tmp_path("remote_conf")