From 11a7a829ae7f0f322f86c2c14699e15af3113f1d Mon Sep 17 00:00:00 2001 From: Marina Gourtovaia Date: Mon, 4 Dec 2023 18:13:07 +0000 Subject: [PATCH 1/2] Added to fixtures an extra study-specific iRODS group. --- t/lib/WTSI/NPG/DriRODSTest.pm | 3 ++- t/lib/WTSI/NPG/iRODS/CollectionTest.pm | 3 ++- t/lib/WTSI/NPG/iRODS/DataObjectTest.pm | 3 ++- t/lib/WTSI/NPG/iRODSTest.pm | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/t/lib/WTSI/NPG/DriRODSTest.pm b/t/lib/WTSI/NPG/DriRODSTest.pm index ee780f93..6312ef8b 100644 --- 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 index e11cb05b..e5eb1cb0 100644 --- 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 index fcc8eac1..4a044ab9 100644 --- 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 index d638f258..dee53935 100644 --- 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 From cd95d4f92ee5064ba71b37bc60ed7b66ea66c3bb Mon Sep 17 00:00:00 2001 From: Marina Gourtovaia Date: Mon, 4 Dec 2023 18:31:01 +0000 Subject: [PATCH 2/2] Dropped superfluous dependency from Build.PL --- Build.PL | 1 - 1 file changed, 1 deletion(-) diff --git a/Build.PL b/Build.PL index db90e0ec..71d49a0f 100644 --- 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;