Added support for iRODS 4.2

irods-contrib · Mar 2, 2017 · c82a299 · c82a299
1 parent 36b98f9
commit c82a299
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -50,12 +50,12 @@ def imeta_ls(*args, **kwargs):
 
 
 class MetadataExtractConfig:
-
+    IRODS_42 = config('IRODS_42', default=False, cast=bool)
     IRODS_USER = config('IRODS_USER', default='rods')
     IRODS_RESC = config('IRODS_RESC', default='demoResc')
     IRODS_ZONE = config('IRODS_ZONE', default='tempZone')
     IRODS_HOME_PATH = '/{}/home/{}'.format(IRODS_ZONE, IRODS_USER)
-    VAULT_PATH = '/var/lib/irods/iRODS/Vault/home/{}'.format(IRODS_USER)
+    VAULT_PATH = '/var/lib/irods{}/Vault/home/{}'.format('/iRODS' if not IRODS_42 else '', IRODS_USER)
     IMETA_LS_NONE = 'AVUs defined for dataObj {}:\nNone\n'
     ILLUMINA_FOLDER_NAME = 'test_illumina_file'
     ILLUMINA_FILE_NAME = '{}.tar'.format(ILLUMINA_FOLDER_NAME)
@@ -82,9 +82,9 @@ class MetadataExtractConfig:
     GET_MICROSERVICES_RULE_FILE = config('GET_MICROSERVICES_RULE_FILE', default='mlxGetMicroservices.r')
     POPULATE_RULE_FILE = config('POPULATE_RULE_FILE', default='mlxPopulate.r')
     MANIFEST_RULE_FILE = config('MANIFEST_RULE_FILE', default='mlxManifest.r')
-    MSI_PACKAGE_VERSION = config('MSI_PACKAGE_VERSION', default='1.0.0')
+    MSI_PACKAGE_VERSION = config('MSI_PACKAGE_VERSION', default='1.1.0')
     METALNX_MSIS_INSTALLED = config('METALNX_MSIS_INSTALLED').split(',')
-    IRODS_MSIS_INSTALLED = config('IRODS_MSIS_INSTALLED').split(',')
+    IRODS_MSIS_INSTALLED = config('IRODS_42_MSIS_INSTALLED').split(',') if IRODS_42 else config('IRODS_MSIS_INSTALLED').split(',')
 
     RULE_HEADERS_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'rules')
 

diff --git a/tests/env-sample b/tests/env-sample
@@ -3,6 +3,7 @@ IRODS_RESC=demoResc
 IRODS_ZONE=tempZone
 IRODS_COLL_ABS_PATH=/tempZone/home/rods
 MSI_PACKAGE_VERSION=1.1.0
+IRODS_42=True
 GET_VERSION_RULE_FILE=mlxGetVersion.r
 BAM_RULE_FILE=mlxExtractMetadataBam.r
 JPEG_RULE_FILE=mlxExtractMetadataJpeg.r
@@ -11,4 +12,5 @@ POPULATE_RULE_FILE=mlxPopulate.r
 MANIFEST_RULE_FILE=mlxManifest.r
 GET_MICROSERVICES_RULE_FILE=mlxGetMicroservices.r
 METALNX_MSIS_INSTALLED=libmsiget_illumina_meta.so,libmsiobjget_microservices.so,libmsiobjget_version.so,libmsiobjjpeg_extract.so,libmsiobjput_mdbam.so,libmsiobjput_mdmanifest.so,libmsiobjput_mdvcf.so,libmsiobjput_populate.so
-IRODS_MSIS_INSTALLED=libmsiobjget_http.so,libmsiobjget_irods.so,libmsiobjget_slink.so,libmsiobjput_http.so,libmsiobjput_irods.so,libmsiobjput_slink.so,libmsisync_to_archive.so,libmsi_update_unixfilesystem_resource_free_space.so
+IRODS_MSIS_INSTALLED=libmsiobjget_http.so,libmsiobjget_irods.so,libmsiobjget_slink.so,libmsiobjput_http.so,libmsiobjput_irods.so,libmsiobjput_slink.so,libmsisync_to_archive.so,libmsi_update_unixfilesystem_resource_free_space.so
+IRODS_42_MSIS_INSTALLED=libmsi_update_unixfilesystem_resource_free_space.so,libmsisync_to_archive.so