squash w/ test adjustments commit.

DICE-UNC · Dec 2, 2023 · 45afc9b · 45afc9b
1 parent 6486b6c
commit 45afc9b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/BulkFileOperationsAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/BulkFileOperationsAOImplTest.java
@@ -16,6 +16,7 @@
 import org.irods.jargon.testutils.filemanip.ScratchFileUtils;
 import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -480,6 +481,9 @@ public void testExtractBundleWithOverwriteNoBulkWhenTargetCollectionAlreadyExist
 			irodsFileSystem.closeAndEatExceptions();
 			return;
 		}
+
+		// Skip if iRODS 4.3.0.
+		Assume.assumeFalse("Test issue discovered post iRODS 4.3.0 release", props.isVersion("rods4.3.0"));
 
 		IRODSFile irodsFile = null;
 
@@ -508,6 +512,7 @@ public void testExtractBundleWithOverwriteNoBulkWhenTargetCollectionAlreadyExist
 		BulkFileOperationsAO bulkFileOperationsAO = irodsFileSystem.getIRODSAccessObjectFactory()
 				.getBulkFileOperationsAO(irodsAccount);
 
+		// TODO Create an issue for this if it fails in 4.3.1 too.
 		bulkFileOperationsAO.createABundleFromIrodsFilesAndStoreInIrods(targetBunFileAbsPath, targetIrodsCollection,
 				"");
 

diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/CollectionAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/CollectionAOImplTest.java
@@ -682,6 +682,7 @@ public void testBulkAddAvuMetadataWithDuplicate() throws Exception {
 
 		IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory();
 
+		// Skip if iRODS 4.3.0.
 		Assume.assumeFalse("iRODS 4.3.0 does not report an error on duplicate AVUs",
 				accessObjectFactory.getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0"));
 
@@ -830,6 +831,7 @@ public void testAddDuplicateAvuMetadata() throws Exception {
 
 		IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory();
 
+		// Skip if iRODS 4.3.0.
 		Assume.assumeFalse("iRODS 4.3.0 does not report an error on duplicate AVUs",
 				accessObjectFactory.getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0"));
 

diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/DataObjectAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/DataObjectAOImplTest.java
@@ -2822,6 +2822,7 @@ public void testAddAVUMetadataToDataObjectTwice() throws Exception {
 				.instanceIRODSFile(targetIrodsCollection);
 		IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory();
 
+		// Skip if iRODS 4.3.0.
 		Assume.assumeFalse("iRODS 4.3.0 does not report an error on duplicate AVUs",
 				accessObjectFactory.getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0"));
 

diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/QuotaAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/QuotaAOImplTest.java
@@ -63,6 +63,7 @@ public void testSetUserResourceQuotaThenListAll() throws Exception {
 		IRODSAccount irodsAccount = testingPropertiesHelper
 				.buildIRODSAccountFromTertiaryTestProperties(testingProperties);
 
+		// Skip if iRODS 4.3.0.
 		Assume.assumeFalse("iRODS 4.3.0 does not support user quotas", irodsFileSystem.getIRODSAccessObjectFactory()
 				.getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0"));
 
@@ -122,6 +123,7 @@ public void testSetUserResourceQuotaThenListUser() throws Exception {
 		IRODSAccount irodsAccount = testingPropertiesHelper
 				.buildIRODSAccountFromTertiaryTestProperties(testingProperties);
 
+		// Skip if iRODS 4.3.0.
 		Assume.assumeFalse("iRODS 4.3.0 does not support user quotas", irodsFileSystem.getIRODSAccessObjectFactory()
 				.getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0"));
 
@@ -154,6 +156,7 @@ public void testSetThenListGlobalQuotaForUser() throws Exception {
 
 		IRODSAccount adminAccount = testingPropertiesHelper.buildIRODSAdminAccountFromTestProperties(testingProperties);
 
+		// Skip if iRODS 4.3.0.
 		Assume.assumeFalse("iRODS 4.3.0 does not support user quotas", irodsFileSystem.getIRODSAccessObjectFactory()
 				.getIRODSServerProperties(adminAccount).isVersion("rods4.3.0"));
 
@@ -180,6 +183,7 @@ public void testSetGlobalForUserThenListAllGlobalQuota() throws Exception {
 		IRODSAccount irodsAccount = testingPropertiesHelper
 				.buildIRODSAccountFromSecondaryTestProperties(testingProperties);
 
+		// Skip if iRODS 4.3.0.
 		Assume.assumeFalse("iRODS 4.3.0 does not support user quotas", irodsFileSystem.getIRODSAccessObjectFactory()
 				.getIRODSServerProperties(adminAccount).isVersion("rods4.3.0"));