squash w/ long standing tests.

korydraughn · Dec 17, 2024 · 5c7463b · 5c7463b
1 parent d86e6ec
commit 5c7463b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/scripts/irods/test/test_iquest.py b/scripts/irods/test/test_iquest.py
@@ -152,11 +152,12 @@ def test_iquest_incorrect_format_count(self):
 
     def test_iquest_does_not_fail_to_find_data_objects_with_SQL_keyword_names_select_and_where__issue_7174(self):
         for data_object in ['selected_file', 'where_file', 'select.txt', 'where.txt']:
-            self.admin.assert_icommand(['itouch', data_object])
-            self.admin.assert_icommand(['ils', data_object], 'STDOUT', [data_object])
-            expected_output = ['DATA_NAME = ' + data_object]
-            self.admin.assert_icommand(['iquest', f"SELECT DATA_NAME, DATA_CREATE_TIME WHERE DATA_NAME = '{data_object}'"], 'STDOUT', expected_output)
-            self.admin.assert_icommand(['iquest', f"SELECT DATA_NAME, DATA_CREATE_TIME WHERE DATA_NAME like '%{data_object}%'"], 'STDOUT', expected_output)
+            with self.subTest(f'Data object name: [{data_object}]'):
+                self.admin.assert_icommand(['itouch', data_object])
+                self.admin.assert_icommand(['ils', data_object], 'STDOUT', [data_object])
+                expected_output = ['DATA_NAME = ' + data_object]
+                self.admin.assert_icommand(['iquest', f"SELECT DATA_NAME, DATA_CREATE_TIME WHERE DATA_NAME = '{data_object}'"], 'STDOUT', expected_output)
+                self.admin.assert_icommand(['iquest', f"SELECT DATA_NAME, DATA_CREATE_TIME WHERE DATA_NAME like '%{data_object}%'"], 'STDOUT', expected_output)
 
 class test_iquest_with_data_resc_hier(unittest.TestCase):
     @classmethod

diff --git a/scripts/irods/test/test_itouch.py b/scripts/irods/test/test_itouch.py
@@ -264,8 +264,9 @@ def test_itouch_returns_better_error_message_when_given_a_coordinating_resource_
 
     def test_itouch_does_not_return_SYS_NO_GOOD_REPLICA_when_new_data_object_name_contains_single_quote__issue_7169_7972(self):
         for data_object in ["just testin'", "test'file"]:
-            self.user.assert_icommand(['itouch', data_object])
-            self.user.assert_icommand(['ils', data_object], 'STDOUT', [data_object])
+            with self.subTest(f'Data object name: [{data_object}]'):
+                self.user.assert_icommand(['itouch', data_object])
+                self.user.assert_icommand(['ils', data_object], 'STDOUT', [data_object])
 
     def get_replica_mtime(self, path, replica_number):
         collection = os.path.dirname(path)

diff --git a/scripts/irods/test/test_misc.py b/scripts/irods/test/test_misc.py
@@ -459,7 +459,7 @@ def test_tcp_keepalive_probes__issue_2533_3824(self):
     def test_server_side_delay_rule_locking_API__issue_8023(self):
         self.admin.assert_icommand(['irule', '-r', 'irods_rule_engine_plugin-irods_rule_language-instance', 'msi_test_delay_rule_locking_api', 'null', 'ruleExecOut'])
 
-    def test_logical_path_containing_AND_keyword_and_single_quotes_does_not_result_in_an_error__issue_8033(self):
+    def test_logical_path_including_the_AND_keyword_SPACES_and_a_SINGLE_QUOTATION_MARK_does_not_result_in_an_error__issue_8033(self):
         coll_name = 'colA and colB'
         self.admin.assert_icommand(['imkdir', coll_name])
         self.admin.assert_icommand(['ils', coll_name], 'STDOUT', [os.path.join(self.admin.session_collection, coll_name)])