fixed skip if

mamba-org · Jan 28, 2022 · 77a57c1 · 77a57c1
1 parent d36aac3
commit 77a57c1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/test/helpers.py b/test/helpers.py
@@ -116,7 +116,7 @@ def path_to_name(path):
 
 
 def ifnone(var):
-    return (var == None) or (var == "")
+    return (var is None) or (var == "")
 
 
 def get_files(file, expect=None):
@@ -177,31 +177,29 @@ def gha_credentials_dont_exist():
     return user_not_set and pwd_not_set
 
 
-def aws_credentials_exist():
-    sec_acc_key = ifnone("AWS_SECRET_ACCESS_KEY")
-    acc_key_id = ifnone("AWS_ACCESS_KEY_ID")
-    default_region = ifnone("AWS_DEFAULT_REGION")
+def aws_credential_missing():
+    sec_acc_key = ifnone(os.environ.get("AWS_SECRET_ACCESS_KEY"))
+    acc_key_id = ifnone(os.environ.get("AWS_ACCESS_KEY_ID"))
+    default_region = ifnone(os.environ.get("AWS_DEFAULT_REGION"))
     return sec_acc_key or acc_key_id or default_region
 
 
-def aws_credentials_exist():
-    sec_access = not (
-        (os.environ.get("AWS_SECRET_ACCESS_KEY") is None)
-        or (os.environ.get("AWS_SECRET_ACCESS_KEY") == "")
-    )
-    access_id = not (
-        (os.environ.get("AWS_ACCESS_KEY_ID") is None)
-        or (os.environ.get("AWS_ACCESS_KEY_ID") == "")
-    )
-    default_region = not (
-        (os.environ.get("AWS_DEFAULT_REGION") is None)
-        or (os.environ.get("AWS_DEFAULT_REGION") == "")
-    )
-    return sec_access and access_id and default_region
+def aws_credential_all_missing():
+    sec_acc_key = ifnone(os.environ.get("AWS_SECRET_ACCESS_KEY"))
+    acc_key_id = ifnone(os.environ.get("AWS_ACCESS_KEY_ID"))
+    default_region = ifnone(os.environ.get("AWS_DEFAULT_REGION"))
+    return sec_acc_key and acc_key_id and default_region
+
+
+def aws_credentials_all_exist():
+    sec_acc_key = ifnone(os.environ.get("AWS_SECRET_ACCESS_KEY"))
+    acc_key_id = ifnone(os.environ.get("AWS_ACCESS_KEY_ID"))
+    default_region = ifnone(os.environ.get("AWS_DEFAULT_REGION"))
+    return not sec_acc_key and not acc_key_id and not default_region
 
 
 skip_aws_credentials = pytest.mark.skipif(
-    not aws_credentials_exist(), reason="Not all AWS credentials are set"
+    aws_credential_missing(), reason="Not all AWS credentials are set"
 )
 
 

diff --git a/test/test_s3mock.py b/test/test_s3mock.py
@@ -8,7 +8,7 @@ def mock_s3_minio(xprocess, file, fs_ready):
     set_env_var(file, "AWS_ACCESS_KEY_ID")
     set_env_var(file, "AWS_DEFAULT_REGION")
 
-    assert aws_credentials_exist() == True
+    assert aws_credentials_all_exist() == True
 
     start_docker = [
         "docker",
@@ -241,7 +241,7 @@ def test_growing_file(
         remote_zck_path = file["test_path"] / Path("conda_mock") / name
         local_zck_path = file["tmp_path"] / name.name
 
-        assert aws_credentials_exist() == True
+        assert aws_credentials_all_exist() == True
         remove_all(file)
 
         content_present, gf = setup_file(

diff --git a/test/test_s3server.py b/test/test_s3server.py
@@ -167,7 +167,7 @@ def test_growing_file(
         remote_zck_path = file["test_path"] / Path("conda_mock") / name
         local_zck_path = file["tmp_path"] / name.name
 
-        assert aws_credentials_exist() == True
+        assert aws_credentials_all_exist() == True
         remove_all(file)
 
         content_present, gf = setup_file(