Skip to content

Commit 9b6216f

Browse files
anthony-tuiningaanthony-tuininga
committed
Refactor tests to eliminate the "fake" client version for thin mode.
1 parent b18ce9e commit 9b6216f

31 files changed

+217
-320
lines changed

‎tests/create_schema.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@
4949
proxy_password=test_env.get_proxy_password(),
5050
edition_name=test_env.get_edition_name(),
5151
)
52-
if test_env.get_server_version() >= (21, 0):
52+
if test_env.has_server_version(21):
5353
test_env.run_sql_script(
5454
conn, "create_schema_21", main_user=test_env.get_main_user()
5555
)
56-
if test_env.get_server_version() >= (23, 4):
56+
if test_env.has_server_version(23, 4):
5757
test_env.run_sql_script(
5858
conn, "create_schema_23_4", main_user=test_env.get_main_user()
5959
)
60-
if test_env.get_server_version() >= (23, 5):
60+
if test_env.has_server_version(23, 5):
6161
test_env.run_sql_script(
6262
conn, "create_schema_23_5", main_user=test_env.get_main_user()
6363
)
64-
if test_env.get_server_version() >= (23, 7):
64+
if test_env.has_server_version(23, 7):
6565
test_env.run_sql_script(
6666
conn, "create_schema_23_7", main_user=test_env.get_main_user()
6767
)

‎tests/test_1100_connection.py‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,12 @@ def test_1102(self):
113113
def test_1103(self):
114114
"1103 - test connection end-to-end tracing attributes"
115115
conn = test_env.get_connection()
116-
if test_env.get_client_version() >= (
117-
12,
118-
1,
119-
) and not self.is_on_oracle_cloud(conn):
120-
sql = """select dbop_name from v$sql_monitor
121-
where sid = sys_context('userenv', 'sid')
122-
and status = 'EXECUTING'"""
123-
self.__verify_attributes(conn, "dbop", "oracledb_dbop", sql)
116+
if test_env.has_client_version(12, 1):
117+
if not self.is_on_oracle_cloud(conn):
118+
sql = """select dbop_name from v$sql_monitor
119+
where sid = sys_context('userenv', 'sid')
120+
and status = 'EXECUTING'"""
121+
self.__verify_attributes(conn, "dbop", "oracledb_dbop", sql)
124122
sql = "select sys_context('userenv', 'action') from dual"
125123
self.__verify_attributes(conn, "action", "oracledb_Action", sql)
126124
self.__verify_attributes(conn, "action", None, sql)
@@ -326,7 +324,7 @@ def test_1117(self):
326324
def test_1118(self):
327325
"1118 - test connection attribute values"
328326
conn = test_env.get_connection()
329-
if test_env.get_client_version() >= (12, 1):
327+
if test_env.has_client_version(12, 1):
330328
self.assertEqual(conn.ltxid, b"")
331329
self.assertFalse(conn.autocommit)
332330
conn.autocommit = True
@@ -359,7 +357,7 @@ def test_1119(self):
359357
"stmtcachesize",
360358
"warning",
361359
]
362-
if test_env.get_client_version() >= (12, 1):
360+
if test_env.has_client_version(12, 1):
363361
attr_names.append("ltxid")
364362
for name in attr_names:
365363
with self.assertRaisesFullCode("DPY-1001"):
@@ -627,10 +625,7 @@ def test_1130(self):
627625
cursor.callproc("dbms_output.get_line", (string_var, number_var))
628626
self.assertEqual(string_var.getvalue(), test_string)
629627

630-
@unittest.skipIf(
631-
not test_env.get_is_thin() and test_env.get_client_version() < (18, 1),
632-
"unsupported client",
633-
)
628+
@unittest.skipUnless(test_env.has_client_version(18), "unsupported client")
634629
def test_1131(self):
635630
"1131 - test connection call_timeout"
636631
conn = test_env.get_connection()
@@ -699,8 +694,8 @@ def test_1135(self):
699694
(instance_name,) = cursor.fetchone()
700695
self.assertEqual(conn.instance_name.upper(), instance_name)
701696

702-
@unittest.skipIf(
703-
test_env.get_client_version() < (18, 1), "not supported on this client"
697+
@unittest.skipUnless(
698+
test_env.has_client_version(18), "not supported on this client"
704699
)
705700
def test_1136(self):
706701
"1136 - test deprecated attributes"
@@ -709,11 +704,8 @@ def test_1136(self):
709704
self.assertEqual(conn.callTimeout, 500)
710705

711706
@unittest.skipIf(test_env.get_is_drcp(), "not supported with DRCP")
712-
@unittest.skipIf(
713-
test_env.get_server_version() < (23, 0)
714-
or test_env.get_client_version() < (23, 0),
715-
"unsupported client/server",
716-
)
707+
@unittest.skipUnless(test_env.has_server_version(23), "unsupported server")
708+
@unittest.skipUnless(test_env.has_client_version(23), "unsupported client")
717709
def test_1137(self):
718710
"1137 - test maximum allowed length for password"
719711
conn = test_env.get_connection()

‎tests/test_1700_error.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ def test_1702(self):
9292
(error_obj,) = cm.exception.args
9393
self.assertEqual(error_obj.full_code, "DPI-1037")
9494

95-
@unittest.skipIf(
96-
test_env.get_client_version() < (23, 1), "unsupported client"
97-
)
95+
@unittest.skipUnless(test_env.has_client_version(23), "unsupported client")
9896
def test_1703(self):
9997
"1703 - test generation of error help portal URL"
10098
cursor = self.conn.cursor()

‎tests/test_2200_number_var.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -----------------------------------------------------------------------------
2-
# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
2+
# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
33
#
44
# This software is dual-licensed to you under the Universal Permissive License
55
# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -74,8 +74,8 @@ def setUp(self):
7474
self.raw_data.append(data_tuple)
7575
self.data_by_key[i] = data_tuple
7676

77-
@unittest.skipIf(
78-
test_env.get_client_version() < (12, 1), "not supported on this client"
77+
@unittest.skipUnless(
78+
test_env.has_client_version(12, 1), "not supported on this client"
7979
)
8080
def test_2200(self):
8181
"2200 - test binding in a boolean"

‎tests/test_2400_pool.py‎

Lines changed: 25 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ def __perform_reconfigure_test(
113113
ping_interval=ping_interval,
114114
getmode=getmode,
115115
)
116-
if test_env.get_client_version() >= (12, 1):
116+
if test_env.has_client_version(12, 1):
117117
creation_args["max_lifetime_session"] = max_lifetime_session
118-
if test_env.get_client_version() >= (12, 2):
118+
if test_env.has_client_version(12, 2):
119119
creation_args["wait_timeout"] = wait_timeout
120-
if test_env.get_client_version() >= (18, 3):
120+
if test_env.has_client_version(18, 3):
121121
creation_args["max_sessions_per_shard"] = max_sessions_per_shard
122-
if test_env.get_client_version() >= (19, 11):
122+
if test_env.has_client_version(19, 11):
123123
creation_args["soda_metadata_cache"] = soda_metadata_cache
124124

125125
pool = test_env.get_pool(**creation_args)
@@ -167,27 +167,21 @@ def __verify_create_arg(self, arg_name, arg_value, sql):
167167
self.assertEqual(fetched_value, arg_value)
168168
pool.close()
169169

170-
@unittest.skipIf(
171-
test_env.get_client_version() < (19, 1), "not supported on this client"
172-
)
173170
def test_2400(self):
174171
"2400 - test getting default pool parameters"
175172
pool = test_env.get_pool()
176173
self.assertEqual(pool.busy, 0)
177174
self.assertEqual(pool.dsn, test_env.get_connect_string())
178175
self.assertEqual(pool.tnsentry, pool.dsn)
179-
if test_env.get_client_version() >= (12, 2):
176+
if test_env.has_client_version(12, 2):
180177
self.assertEqual(pool.getmode, oracledb.POOL_GETMODE_WAIT)
181178
self.assertIs(pool.getmode, oracledb.PoolGetMode.WAIT)
182179
self.assertTrue(pool.homogeneous)
183180
self.assertEqual(pool.increment, 1)
184181
self.assertEqual(pool.max, 2)
185-
if test_env.get_client_version() >= (12, 1):
182+
if test_env.has_client_version(12, 1):
186183
self.assertEqual(pool.max_lifetime_session, 0)
187-
if not test_env.get_is_thin() and test_env.get_client_version() >= (
188-
18,
189-
3,
190-
):
184+
if not test_env.get_is_thin() and test_env.has_client_version(18, 3):
191185
self.assertEqual(pool.max_sessions_per_shard, 0)
192186
self.assertEqual(pool.min, 1)
193187
if test_env.get_is_thin():
@@ -196,10 +190,7 @@ def test_2400(self):
196190
self.assertRegex(pool.name, "^OCI:SP:.+")
197191
self.assertEqual(pool.ping_interval, 60)
198192
self.assertEqual(pool.stmtcachesize, oracledb.defaults.stmtcachesize)
199-
if not test_env.get_is_thin() and test_env.get_client_version() >= (
200-
19,
201-
11,
202-
):
193+
if not test_env.get_is_thin() and test_env.has_client_version(19, 11):
203194
self.assertFalse(pool.soda_metadata_cache)
204195
self.assertEqual(pool.thin, test_env.get_is_thin())
205196
self.assertEqual(pool.timeout, 0)
@@ -234,9 +225,6 @@ def test_2401(self):
234225
self.assertEqual(user, test_env.get_proxy_user().upper())
235226
conn.close()
236227

237-
@unittest.skipIf(
238-
test_env.get_client_version() < (19, 1), "not supported on this client"
239-
)
240228
def test_2402(self):
241229
"2402 - test setting pool attributes"
242230
pool = test_env.get_pool()
@@ -248,26 +236,20 @@ def test_2402(self):
248236
((12, 1), "max_lifetime_session", 3),
249237
]
250238
for version, attr_name, value in test_values:
251-
if test_env.get_client_version() >= version:
239+
if test_env.has_client_version(*version):
252240
setattr(pool, attr_name, value)
253241
self.assertEqual(getattr(pool, attr_name), value)
254242
self.assertRaises(
255243
TypeError, setattr, pool, attr_name, "invalid value"
256244
)
257245

258-
if not test_env.get_is_thin() and test_env.get_client_version() >= (
259-
18,
260-
3,
261-
):
246+
if not test_env.get_is_thin() and test_env.has_client_version(18, 3):
262247
self.assertEqual(pool.max_sessions_per_shard, 0)
263248
self.assertRaises(
264249
TypeError, setattr, pool, "max_sessions_per_shard", "bad_val"
265250
)
266251

267-
if not test_env.get_is_thin() and test_env.get_client_version() >= (
268-
19,
269-
11,
270-
):
252+
if not test_env.get_is_thin() and test_env.has_client_version(19, 11):
271253
pool.soda_metadata_cache = True
272254
self.assertTrue(pool.soda_metadata_cache)
273255
self.assertRaises(
@@ -471,7 +453,7 @@ def test_2410(self):
471453
)
472454
def test_2411(self):
473455
"2411 - test PL/SQL session callbacks"
474-
if test_env.get_client_version() < (12, 2):
456+
if not test_env.has_client_version(12, 2):
475457
self.skipTest("PL/SQL session callbacks not supported before 12.2")
476458
callback = "pkg_SessionCallback.TheCallback"
477459
pool = test_env.get_pool(
@@ -526,7 +508,7 @@ def test_2412(self):
526508
pool = test_env.get_pool(getmode=oracledb.POOL_GETMODE_NOWAIT)
527509
conn = pool.acquire()
528510
self.assertRaises(TypeError, pool.release, conn, tag=12345)
529-
if test_env.get_client_version() >= (12, 2):
511+
if test_env.has_client_version(12, 2):
530512
with self.assertRaisesFullCode("ORA-24488"):
531513
pool.release(conn, tag="INVALID_TAG")
532514

@@ -577,13 +559,13 @@ def test_2415(self):
577559
self.__perform_reconfigure_test(
578560
"getmode", oracledb.POOL_GETMODE_NOWAIT
579561
)
580-
if test_env.get_client_version() >= (12, 1):
562+
if test_env.has_client_version(12, 1):
581563
self.__perform_reconfigure_test("max_lifetime_session", 2000)
582-
if test_env.get_client_version() >= (12, 2):
564+
if test_env.has_client_version(12, 2):
583565
self.__perform_reconfigure_test("wait_timeout", 8000)
584-
if test_env.get_client_version() >= (18, 3):
566+
if test_env.has_client_version(18, 3):
585567
self.__perform_reconfigure_test("max_sessions_per_shard", 5)
586-
if test_env.get_client_version() >= (19, 11):
568+
if test_env.has_client_version(19, 11):
587569
self.__perform_reconfigure_test("soda_metadata_cache", True)
588570

589571
@unittest.skipIf(
@@ -676,8 +658,8 @@ def test_2421(self):
676658
with self.assertRaisesFullCode("DPY-1002"):
677659
pool.acquire()
678660

679-
@unittest.skipIf(
680-
test_env.get_client_version() < (19, 1), "not supported on this client"
661+
@unittest.skipUnless(
662+
test_env.has_client_version(19), "not supported on this client"
681663
)
682664
def test_2422(self):
683665
"2422 - using the pool beyond max limit raises an error"
@@ -862,11 +844,11 @@ def test_2437(self):
862844
with self.assertRaisesFullCode("DPY-2023"):
863845
test_env.get_pool(connectiontype=int)
864846

865-
@unittest.skipIf(
866-
test_env.get_server_version() < (12, 2), "not supported on this server"
847+
@unittest.skipUnless(
848+
test_env.has_server_version(12, 2), "not supported on this server"
867849
)
868-
@unittest.skipIf(
869-
test_env.get_client_version() < (19, 1), "not supported on this client"
850+
@unittest.skipUnless(
851+
test_env.has_client_version(19), "not supported on this client"
870852
)
871853
def test_2438(self):
872854
"2438 - ensure that timed wait times out with appropriate exception"
@@ -876,8 +858,8 @@ def test_2438(self):
876858
with self.assertRaisesFullCode("DPY-4005"):
877859
pool.acquire()
878860

879-
@unittest.skipIf(
880-
test_env.get_client_version() < (18, 1), "not supported on this client"
861+
@unittest.skipUnless(
862+
test_env.has_client_version(18), "not supported on this client"
881863
)
882864
def test_2439(self):
883865
"2439 - ensure call timeout is reset on connections returned by pool"

‎tests/test_2500_string_var.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -----------------------------------------------------------------------------
2-
# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
2+
# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
33
#
44
# This software is dual-licensed to you under the Universal Permissive License
55
# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -424,8 +424,8 @@ def test_2527(self):
424424
self.cursor.fetchall(), [(1, short_string), (2, long_string)]
425425
)
426426

427-
@unittest.skipIf(
428-
test_env.get_server_version() < (12, 2), "not supported on this server"
427+
@unittest.skipUnless(
428+
test_env.has_server_version(12, 2), "not supported on this server"
429429
)
430430
def test_2528(self):
431431
"2528 - test issue 50 - avoid error ORA-24816"

‎tests/test_2700_aq_dbobject.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ def test_2715(self):
358358
f"{self.conn.username}.transform1"
359359
)
360360
queue.enqoptions.transformation = transformation_str
361-
if test_env.get_client_version() >= (23, 1):
361+
if test_env.has_client_version(23):
362362
self.assertEqual(
363363
queue.enqoptions.transformation, transformation_str
364364
)

0 commit comments

Comments
 (0)