squash. More updates to tests for iRODS 5 changes.

korydraughn · Nov 2, 2024 · 63c57bb · 63c57bb
1 parent 0b232d0
commit 63c57bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/scripts/irods/test/test_iput.py b/scripts/irods/test/test_iput.py
@@ -947,6 +947,8 @@ def test_server_honors_server_config_option_checksum_read_buffer_size_in_bytes__
             # self.object_name deleted in teardown
             os.unlink(local_file)
 
+    # TODO Open issue for this.
+    @unittest.skipIf(test.settings.RUN_IN_TOPOLOGY, "Needs to be updated for topology testing or a new test for topology testing needs to be added")
     def test_server_rejects_invalid_server_config_options_for_checksum_read_buffer_size_in_bytes__issue_7947(self):
         self.object_name = 'test_server_rejects_invalid_server_config_options_for_checksum_read_buffer_size_in_bytes__issue_7947'
         server_config_filename = paths.server_config_path()
@@ -973,7 +975,8 @@ def test_server_rejects_invalid_server_config_options_for_checksum_read_buffer_s
                     IrodsController().reload_configuration()
 
                     # put the file and verify we get an error due to invalid configuration
-                    self.admin.assert_icommand(['iput', '-R', self.resource, '-k', local_file, self.object_name], 'STDERR_SINGLELINE', 'CONFIGURATION_ERROR')
+                    self.admin.assert_icommand(['iput', '-R', self.resource, '-k', local_file, self.object_name],
+                            'STDERR_SINGLELINE', '-180000 CONFIGURATION_ERROR')
 
                     # clean up for next iteration
                     self.admin.assert_icommand(['irm', '-f', self.object_name])

diff --git a/scripts/irods/test/test_resource_types.py b/scripts/irods/test/test_resource_types.py
@@ -902,6 +902,7 @@ def test_detached_mode_register_inside_vault__issue_4421(self):
                 os.unlink(filepath)
             lib.remove_resource(self.admin, resource_name)
 
+    @unittest.skip("irods-grid no longer exists as an icommand")
     @unittest.skipUnless(test.settings.RUN_IN_TOPOLOGY, "Only run in topology")
     def test_detached_mode_in_topology__issue_4421(self):
         try:
@@ -998,9 +999,10 @@ def test_detached_mode_in_topology_resource_assigned_to_icat__issue_4421(self):
             if os.path.exists(file2):
                 os.unlink(file2)
 
-            self.admin.assert_icommand("irm -f " + file1)
+            self.admin.run_icommand("irm -f " + file1)
             lib.remove_resource(self.admin, resource_name)
 
+    @unittest.skip("irods-grid no longer exists as an icommand")
     @unittest.skipUnless(test.settings.RUN_IN_TOPOLOGY, "Only run in topology")
     def test_detached_mode_in_topology_with_host_list__issue_4421(self):
         try:
@@ -1099,9 +1101,10 @@ def test_detached_mode_in_topology_with_redirect__issue_4421(self):
             if os.path.exists(file2):
                 os.unlink(file2)
 
-            self.admin.assert_icommand("irm -f " + file1)
+            self.admin.run_icommand("irm -f " + file1)
             lib.remove_resource(self.admin, resource_name)
 
+    @unittest.skip("irods-grid no longer exists as an icommand")
     @unittest.skipUnless(test.settings.RUN_IN_TOPOLOGY, "Only run in topology")
     def test_detached_mode_in_topology_put_with_resource_host_down__issue_4421(self):
         try: