Merge pull request #293 from mgcam/extend_fixtures

Added to fixtures an extra study-specific iRODS group
wtsi-npg · Dec 5, 2023 · 9946efa · 9946efa
2 parents 193e034 + cd95d4f
commit 9946efa
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/Build.PL b/Build.PL
@@ -52,7 +52,6 @@ my $build = WTSI::DNAP::Utilities::Build->new
                          },
    recommends =>         {
                           'Net::LDAP'                     => '0',
-                          'WTSI::DNAP::Warehouse::Schema' => '0',
                          });
 
 $build->create_build_script;
diff --git a/t/lib/WTSI/NPG/DriRODSTest.pm b/t/lib/WTSI/NPG/DriRODSTest.pm
@@ -31,7 +31,8 @@ my $have_admin_rights =
 # Prefix for test iRODS data access groups
 my $group_prefix = 'ss_';
 # Groups to be added to the test iRODS
-my @irods_groups = map { $group_prefix . $_ } (0);
+my @irods_groups = map { $group_prefix . $_, $group_prefix . $_ . '_human' }
+                   (0);
 # Groups added to the test iRODS in fixture setup
 my @groups_added;
 # Enable group tests

diff --git a/t/lib/WTSI/NPG/iRODS/CollectionTest.pm b/t/lib/WTSI/NPG/iRODS/CollectionTest.pm
@@ -27,7 +27,8 @@ my $have_admin_rights =
 # Prefix for test iRODS data access groups
 my $group_prefix = 'ss_';
 # Groups to be added to the test iRODS
-my @irods_groups = map { $group_prefix . $_ } (10, 100);
+my @irods_groups = map { $group_prefix . $_, $group_prefix . $_ . '_human' }
+                   (10, 100);
 # Groups added to the test iRODS in fixture setup
 my @groups_added;
 

diff --git a/t/lib/WTSI/NPG/iRODS/DataObjectTest.pm b/t/lib/WTSI/NPG/iRODS/DataObjectTest.pm
@@ -34,7 +34,8 @@ my $have_admin_rights =
 # Prefix for test iRODS data access groups
 my $group_prefix = 'ss_';
 # Groups to be added to the test iRODS
-my @irods_groups = map { $group_prefix . $_ } (10, 100);
+my @irods_groups = map { $group_prefix . $_, $group_prefix . $_ . '_human' }
+                   (10, 100);
 # Groups added to the test iRODS in fixture setup
 my @groups_added;
 

diff --git a/t/lib/WTSI/NPG/iRODSTest.pm b/t/lib/WTSI/NPG/iRODSTest.pm
@@ -33,7 +33,8 @@ my $irods_tmp_coll;
 # Prefix for test iRODS data access groups
 my $group_prefix = 'ss_';
 # Groups to be added to the test iRODS
-my @irods_groups = map { $group_prefix . $_ } (0, 10, 100);
+my @irods_groups = map { $group_prefix . $_, $group_prefix . $_ . '_human' }
+                   (0, 10, 100);
 # Groups added to the test iRODS in fixture setup
 my @groups_added;
 # Enable group tests