[irods/irods#3451] irm -n now deprecated

irods · May 30, 2018 · 2406fa2 · 2406fa2
1 parent a1cb983
commit 2406fa2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packaging/test_irods_resource_plugin_s3.py b/packaging/test_irods_resource_plugin_s3.py
@@ -135,7 +135,7 @@ def test_irm_specific_replica(self):
         self.admin.assert_icommand("ils -L "+self.testfile,'STDOUT_SINGLELINE',self.testfile) # should be listed
         self.admin.assert_icommand("irepl -R "+self.testresc+" "+self.testfile) # creates replica
         self.admin.assert_icommand("ils -L "+self.testfile,'STDOUT_SINGLELINE',self.testfile) # should be listed twice
-        self.admin.assert_icommand("irm -n 0 "+self.testfile) # remove original from cacheResc only
+        self.admin.assert_icommand("irm -n 0 "+self.testfile, 'STDOUT_SINGLELINE','deprecated') # remove original from cacheResc only
         self.admin.assert_icommand("ils -L "+self.testfile,'STDOUT_SINGLELINE',["2 "+self.testresc,self.testfile]) # replica 2 should still be there
         self.admin.assert_icommand_fail("ils -L "+self.testfile,'STDOUT_SINGLELINE',["0 "+self.admin.default_resource,self.testfile]) # replica 0 should be gone
         trashpath = self.admin.session_collection_trash

diff --git a/packaging/test_irods_resource_plugin_s3_for_cloudian.py b/packaging/test_irods_resource_plugin_s3_for_cloudian.py
@@ -137,7 +137,7 @@ def test_irm_specific_replica(self):
         self.admin.assert_icommand("ils -L "+self.testfile,'STDOUT_SINGLELINE',self.testfile) # should be listed
         self.admin.assert_icommand("irepl -R "+self.testresc+" "+self.testfile) # creates replica
         self.admin.assert_icommand("ils -L "+self.testfile,'STDOUT_SINGLELINE',self.testfile) # should be listed twice
-        self.admin.assert_icommand("irm -n 0 "+self.testfile) # remove original from cacheResc only
+        self.admin.assert_icommand("irm -n 0 "+self.testfile, 'STDOUT_SINGLELINE','deprecated') # remove original from cacheResc only
         self.admin.assert_icommand("ils -L "+self.testfile,'STDOUT_SINGLELINE',["2 "+self.testresc,self.testfile]) # replica 2 should still be there
         self.admin.assert_icommand_fail("ils -L "+self.testfile,'STDOUT_SINGLELINE',["0 "+self.admin.default_resource,self.testfile]) # replica 0 should be gone
         trashpath = self.admin.session_collection_trash

diff --git a/packaging/test_irods_resource_plugin_s3_for_gcp.py b/packaging/test_irods_resource_plugin_s3_for_gcp.py
@@ -147,7 +147,7 @@ def test_irm_specific_replica(self):
         self.admin.assert_icommand("ils -L "+self.testfile,'STDOUT_SINGLELINE',self.testfile) # should be listed
         self.admin.assert_icommand("irepl -R "+self.testresc+" "+self.testfile) # creates replica
         self.admin.assert_icommand("ils -L "+self.testfile,'STDOUT_SINGLELINE',self.testfile) # should be listed twice
-        self.admin.assert_icommand("irm -n 0 "+self.testfile) # remove original from cacheResc only
+        self.admin.assert_icommand("irm -n 0 "+self.testfile, 'STDOUT_SINGLELINE','deprecated') # remove original from cacheResc only
         self.admin.assert_icommand("ils -L "+self.testfile,'STDOUT_SINGLELINE',["2 "+self.testresc,self.testfile]) # replica 2 should still be there
         self.admin.assert_icommand_fail("ils -L "+self.testfile,'STDOUT_SINGLELINE',["0 "+self.admin.default_resource,self.testfile]) # replica 0 should be gone
         trashpath = self.admin.session_collection_trash