From 2e81952877d114041b6fbaa86dfefe8285dabdd4 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Fri, 2 Dec 2022 13:12:28 +0100
Subject: [PATCH] Relax file source access requirements in tests

By default the user must have the required role and groups. To simplify the setup of other tests, by default `PosixFileSourceSetup` will not require groups unless explicitly specified in the test.
This way we are always testing the default `test user` access through the role.
---
 lib/galaxy_test/driver/integration_setup.py | 25 +++++++++++++++++----
 test/integration/test_remote_files_posix.py |  9 ++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/lib/galaxy_test/driver/integration_setup.py b/lib/galaxy_test/driver/integration_setup.py
index 9f86c18f3a9..f86c26788fd 100644
--- a/lib/galaxy_test/driver/integration_setup.py
+++ b/lib/galaxy_test/driver/integration_setup.py
@@ -37,9 +37,15 @@ def get_posix_file_source_config(root_dir: str, roles: str, groups: str, include
     return rval
 
 
-def create_file_source_config_file_on(temp_dir, root_dir, include_test_data_dir):
+def create_file_source_config_file_on(
+    temp_dir,
+    root_dir,
+    include_test_data_dir,
+    required_role_expression,
+    required_group_expression,
+):
     file_contents = get_posix_file_source_config(
-        root_dir, REQUIRED_ROLE_EXPRESSION, REQUIRED_GROUP_EXPRESSION, include_test_data_dir
+        root_dir, required_role_expression, required_group_expression, include_test_data_dir
     )
     file_path = os.path.join(temp_dir, "file_sources_conf_posix.yml")
     with open(file_path, "w") as f:
@@ -53,14 +59,25 @@ class PosixFileSourceSetup:
     include_test_data_dir: ClassVar[bool] = False
 
     @classmethod
-    def handle_galaxy_config_kwds(cls, config, clazz_=None):
+    def handle_galaxy_config_kwds(
+        cls,
+        config,
+        clazz_=None,
+        # Require role for access but do not require groups by default on every test to simplify them
+        required_role_expression=REQUIRED_ROLE_EXPRESSION,
+        required_group_expression="",
+    ):
         temp_dir = os.path.realpath(mkdtemp())
         clazz_ = clazz_ or cls
         clazz_._test_driver.temp_directories.append(temp_dir)
         clazz_.root_dir = os.path.join(temp_dir, "root")
 
         file_sources_config_file = create_file_source_config_file_on(
-            temp_dir, clazz_.root_dir, clazz_.include_test_data_dir
+            temp_dir,
+            clazz_.root_dir,
+            clazz_.include_test_data_dir,
+            required_role_expression,
+            required_group_expression,
         )
         config["file_sources_config_file"] = file_sources_config_file
 
diff --git a/test/integration/test_remote_files_posix.py b/test/integration/test_remote_files_posix.py
index 3936c739673..3cc24ccd8d5 100644
--- a/test/integration/test_remote_files_posix.py
+++ b/test/integration/test_remote_files_posix.py
@@ -16,6 +16,15 @@ from galaxy_test.driver.integration_setup import (
 
 
 class PosixFileSourceIntegrationTestCase(PosixFileSourceSetup, integration_util.IntegrationTestCase):
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        PosixFileSourceSetup.handle_galaxy_config_kwds(
+            config,
+            cls,
+            required_role_expression=REQUIRED_ROLE_EXPRESSION,
+            required_group_expression=REQUIRED_GROUP_EXPRESSION,
+        )
+
     def setUp(self):
         super().setUp()
         self._write_file_fixtures()