Skip to content

Commit cc7d518

Browse files
committed
[ 600] Comment out test_files_query_case_sensitive BETWEEN tests
The BETWEEN clause behaves differently for mysql (and mariadb, I assume) than postgres, and the test_files_query_case_sensitive test assumes that we are using postgres. In order to avoid this, the BETWEEN sub-tests have been commented out until such a time as we can make meaningful assertions about the case-sensitive query with a BETWEEN clause based on the flavor of database being used by the connected iRODS server.
1 parent 78557d9 commit cc7d518

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

irods/test/query_test.py

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -180,24 +180,27 @@ def test_files_query_case_sensitive(self):
180180

181181
# BETWEEN tests
182182

183-
result13 = self.sess.query(DataObject.name).filter(
184-
Collection.name == self.coll_path).filter(
185-
Between(DataObject.name, [self.case_sensitive_obj_name1,
186-
self.case_sensitive_obj_name1 + "_"])).all()
187-
self.assertTrue(result13.has_value(self.case_sensitive_obj_name1))
188-
self.assertEqual(len(result13), 1)
189-
190-
result14 = self.sess.query(DataObject.name).filter(
191-
Collection.name == self.coll_path).filter(
192-
Between(DataObject.name, [str.lower(self.case_sensitive_obj_name1),
193-
str.lower(self.case_sensitive_obj_name1) + "_"])).all()
194-
self.assertEqual(len(result14), 0)
195-
196-
result15 = self.sess.query(DataObject.name).filter(
197-
Collection.name == self.coll_path).filter(
198-
Between(DataObject.name, [str.upper(self.case_sensitive_obj_name1),
199-
str.upper(self.case_sensitive_obj_name1) + "_"])).all()
200-
self.assertEqual(len(result15), 0)
183+
# TODO(#600): Uncomment these lines and/or make a new test when database flavor can be detected.
184+
# The resultset for BETWEEN queries can differ from database to database.
185+
186+
#result13 = self.sess.query(DataObject.name).filter(
187+
# Collection.name == self.coll_path).filter(
188+
# Between(DataObject.name, [self.case_sensitive_obj_name1,
189+
# self.case_sensitive_obj_name1 + "_"])).all()
190+
#self.assertTrue(result13.has_value(self.case_sensitive_obj_name1))
191+
#self.assertEqual(len(result13), 1)
192+
193+
#result14 = self.sess.query(DataObject.name).filter(
194+
# Collection.name == self.coll_path).filter(
195+
# Between(DataObject.name, [str.lower(self.case_sensitive_obj_name1),
196+
# str.lower(self.case_sensitive_obj_name1) + "_"])).all()
197+
#self.assertEqual(len(result14), 0)
198+
199+
#result15 = self.sess.query(DataObject.name).filter(
200+
# Collection.name == self.coll_path).filter(
201+
# Between(DataObject.name, [str.upper(self.case_sensitive_obj_name1),
202+
# str.upper(self.case_sensitive_obj_name1) + "_"])).all()
203+
#self.assertEqual(len(result15), 0)
201204

202205
def test_files_query_case_insensitive(self):
203206
# This tests that GenQueries are case-insensitive when the case_sensitive

0 commit comments

Comments
 (0)