Streamline access tokens needed to run gcsfs and gdrive storage tests

Author: nuwang

test/unit/files/_util.py

@@ -57,10 +57,10 @@ def user_context_fixture(user_ftp_dir=None, role_names=None, group_names=None, i
             'dropbox|access_token': os.environ.get('GALAXY_TEST_DROPBOX_ACCESS_TOKEN'),
             'googledrive|access_token': os.environ.get('GALAXY_TEST_GOOGLE_DRIVE_ACCESS_TOKEN'),
             'googledrive|refresh_token': os.environ.get('GALAXY_TEST_GOOGLE_DRIVE_REFRESH_TOKEN'),
-            'googledrive|client_id': os.environ.get('GALAXY_TEST_GOOGLE_DRIVE_CLIENT_ID'),
-            'googledrive|client_secret': os.environ.get('GALAXY_TEST_GOOGLE_DRIVE_CLIENT_SECRET'),
             'googlecloudstorage|project': os.environ.get('GALAXY_TEST_GCS_PROJECT'),
-            'googlecloudstorage|bucket_name': 'genomics-public-data',
+            'googlecloudstorage|bucket_name': os.environ.get('GALAXY_TEST_GCS_BUCKET'),
+            'googlecloudstorage|access_token': os.environ.get('GALAXY_TEST_GCS_ACCESS_TOKEN'),
+            'googlecloudstorage|refresh_token': os.environ.get('GALAXY_TEST_GCS_REFRESH_TOKEN'),
             'onedata|provider_host': os.environ.get('GALAXY_TEST_ONEDATA_PROVIDER_HOST'),
             'onedata|access_token': os.environ.get('GALAXY_TEST_ONEDATA_ACCESS_TOKEN'),
             'basespace|client_id': os.environ.get('GALAXY_TEST_ONEDATA_CLIENT_ID'),

test/unit/files/googledrive_file_sources_conf.yml

@@ -3,6 +3,3 @@
   doc: Test access to a Google drive.
   token: ${user.preferences['googledrive|access_token']}
   refresh_token: ${user.preferences['googledrive|refresh_token']}
-  token_uri: "https://www.googleapis.com/oauth2/v4/token"
-  client_id: ${user.preferences['googledrive|client_id']}
-  client_secret: ${user.preferences['googledrive|client_secret']}

test/unit/files/test_basespace.py

@@ -13,9 +13,9 @@
 
 skip_if_no_basespace_access_token = pytest.mark.skipif(
     not os.environ.get('GALAXY_TEST_BASESPACE_CLIENT_ID')
-    and not os.environ.get('GALAXY_TEST_BASESPACE_CLIENT_SECRET')
-    and not os.environ.get('GALAXY_TEST_BASESPACE_ACCESS_TOKEN')
-    and not os.environ.get('GALAXY_TEST_BASESPACE_TEST_FILE_PATH'),
+    or not os.environ.get('GALAXY_TEST_BASESPACE_CLIENT_SECRET')
+    or not os.environ.get('GALAXY_TEST_BASESPACE_ACCESS_TOKEN')
+    or not os.environ.get('GALAXY_TEST_BASESPACE_TEST_FILE_PATH'),
     reason="GALAXY_TEST_BASESPACE_CLIENT_ID and related vars not set"
 )
 
@@ -28,7 +28,7 @@ def test_file_source():
 
     assert file_source_pair.path == "/"
     file_source = file_source_pair.file_source
-    test_file = os.environ.get('GALAXY_TEST_BASESPACE_TEST_FILE_PATH')
+    test_file = os.environ.get('GALAXY_TEST_BASESPACE_TEST_FILE_PATH', "")
     res = file_source.list(os.path.dirname(test_file), recursive=False, user_context=user_context)
     a_file = find(res, class_="File", name=os.path.basename(test_file))
     assert a_file

test/unit/files/test_gcsfs.py

@@ -1,5 +1,7 @@
 import os
 
+import pytest
+
 from galaxy.files import ConfiguredFileSources, ConfiguredFileSourcesConfig
 from ._util import (
     assert_realizes_contains,
@@ -9,7 +11,16 @@
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 FILE_SOURCES_CONF = os.path.join(SCRIPT_DIRECTORY, "gcsfs_file_sources_conf.yml")
 
+skip_if_no_gcs_access_token = pytest.mark.skipif(
+    not os.environ.get('GALAXY_TEST_GCS_PROJECT')
+    or not os.environ.get('GALAXY_TEST_GCS_BUCKET')
+    or not os.environ.get('GALAXY_TEST_GCS_ACCESS_TOKEN')
+    or not os.environ.get('GALAXY_TEST_GCS_REFRESH_TOKEN'),
+    reason="GALAXY_TEST_GCS_ACCESS_TOKEN and related vars not set"
+)
+
 
+@skip_if_no_gcs_access_token
 def test_file_source():
     user_context = user_context_fixture()
     file_sources = _configured_file_sources()

test/unit/files/test_googledrive.py

@@ -13,9 +13,7 @@
 
 skip_if_no_google_drive_access_token = pytest.mark.skipif(
     not os.environ.get('GALAXY_TEST_GOOGLE_DRIVE_ACCESS_TOKEN')
-    and not os.environ.get('GALAXY_TEST_GOOGLE_DRIVE_REFRESH_TOKEN')
-    and not os.environ.get('GALAXY_TEST_GOOGLE_DRIVE_CLIENT_ID')
-    and not os.environ.get('GALAXY_TEST_GOOGLE_DRIVE_CLIENT_SECRET'),
+    or not os.environ.get('GALAXY_TEST_GOOGLE_DRIVE_REFRESH_TOKEN'),
     reason="GALAXY_TEST_GOOGLE_DRIVE_ACCESS_TOKEN and related vars not set"
 )
 

test/unit/files/test_onedata.py

@@ -13,7 +13,7 @@
 
 skip_if_no_onedata_access_token = pytest.mark.skipif(
     not os.environ.get('GALAXY_TEST_ONEDATA_PROVIDER_HOST')
-    and not os.environ.get('GALAXY_TEST_ONEDATA_ACCESS_TOKEN'),
+    or not os.environ.get('GALAXY_TEST_ONEDATA_ACCESS_TOKEN'),
     reason="GALAXY_TEST_ONEDATA_PROVIDER_HOST and GALAXY_TEST_ONEDATA_ACCESS_TOKEN not set"
 )