fix test for oracledb 2.3.0

Separate from adding support for 2pc for oracledb, get the test
suite to pass cleanly for all oracledb versions first

Change-Id: I39ba91e81f2afe5e9610a65fdcc88025f207089b
(cherry picked from commit a40aeef5c553212fa227b315c7da7d32fbef933c)

diff --git a/test/orm/test_transaction.py b/test/orm/test_transaction.py
index 47bcf69b5718f1a952fa17b8e38322fada5ecadf..faa311cc8a202d73931a09ccde44e4839465fb34 100644 (file)
--- a/test/orm/test_transaction.py
+++ b/test/orm/test_transaction.py
@@ -5,7 +5,6 @@ import random
 from typing import Optional
 from typing import TYPE_CHECKING
 
-from sqlalchemy import Column
 from sqlalchemy import event
 from sqlalchemy import exc as sa_exc
 from sqlalchemy import func
@@ -39,6 +38,7 @@ from sqlalchemy.testing import is_not
 from sqlalchemy.testing import mock
 from sqlalchemy.testing.config import Variation
 from sqlalchemy.testing.fixtures import fixture_session
+from sqlalchemy.testing.schema import Column
 from sqlalchemy.testing.util import gc_collect
 from test.orm._fixtures import FixtureTest
 
@@ -2492,7 +2492,11 @@ class JoinIntoAnExternalTransactionFixture:
 
         self.metadata = MetaData()
         self.table = Table(
-            "t1", self.metadata, Column("id", Integer, primary_key=True)
+            "t1",
+            self.metadata,
+            Column(
+                "id", Integer, primary_key=True, test_needs_autoincrement=True
+            ),
         )
         with self.connection.begin():
             self.table.create(self.connection, checkfirst=True)

diff --git a/test/profiles.txt b/test/profiles.txt
index 370d895b6275a9eff80ecd474916f670a31da750..976949e7b73d2ce7d03504afff8b4180fe7d05e0 100644 (file)
--- a/test/profiles.txt
+++ b/test/profiles.txt
@@ -358,8 +358,6 @@ test.aaa_profiling.test_resultset.ExecutionTest.test_minimal_engine_execute x86_
 test.aaa_profiling.test_resultset.ExecutionTest.test_minimal_engine_execute x86_64_linux_cpython_3.11_mariadb_mysqldb_dbapiunicode_nocextensions 110
 test.aaa_profiling.test_resultset.ExecutionTest.test_minimal_engine_execute x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_cextensions 108
 test.aaa_profiling.test_resultset.ExecutionTest.test_minimal_engine_execute x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_nocextensions 110
-test.aaa_profiling.test_resultset.ExecutionTest.test_minimal_engine_execute x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_cextensions 108
-test.aaa_profiling.test_resultset.ExecutionTest.test_minimal_engine_execute x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_nocextensions 110
 test.aaa_profiling.test_resultset.ExecutionTest.test_minimal_engine_execute x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_cextensions 108
 test.aaa_profiling.test_resultset.ExecutionTest.test_minimal_engine_execute x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_nocextensions 110
 test.aaa_profiling.test_resultset.ExecutionTest.test_minimal_engine_execute x86_64_linux_cpython_3.11_sqlite_pysqlite_dbapiunicode_cextensions 108
@@ -371,8 +369,6 @@ test.aaa_profiling.test_resultset.ResultSetTest.test_contains_doesnt_compile x86
 test.aaa_profiling.test_resultset.ResultSetTest.test_contains_doesnt_compile x86_64_linux_cpython_3.11_mariadb_mysqldb_dbapiunicode_nocextensions 9
 test.aaa_profiling.test_resultset.ResultSetTest.test_contains_doesnt_compile x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_cextensions 8
 test.aaa_profiling.test_resultset.ResultSetTest.test_contains_doesnt_compile x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_nocextensions 9
-test.aaa_profiling.test_resultset.ResultSetTest.test_contains_doesnt_compile x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_cextensions 8
-test.aaa_profiling.test_resultset.ResultSetTest.test_contains_doesnt_compile x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_nocextensions 9
 test.aaa_profiling.test_resultset.ResultSetTest.test_contains_doesnt_compile x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_cextensions 8
 test.aaa_profiling.test_resultset.ResultSetTest.test_contains_doesnt_compile x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_nocextensions 9
 test.aaa_profiling.test_resultset.ResultSetTest.test_contains_doesnt_compile x86_64_linux_cpython_3.11_sqlite_pysqlite_dbapiunicode_cextensions 8
@@ -384,8 +380,6 @@ test.aaa_profiling.test_resultset.ResultSetTest.test_fetch_by_key_mappings x86_6
 test.aaa_profiling.test_resultset.ResultSetTest.test_fetch_by_key_mappings x86_64_linux_cpython_3.11_mariadb_mysqldb_dbapiunicode_nocextensions 14671
 test.aaa_profiling.test_resultset.ResultSetTest.test_fetch_by_key_mappings x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_cextensions 2669
 test.aaa_profiling.test_resultset.ResultSetTest.test_fetch_by_key_mappings x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_nocextensions 14676
-test.aaa_profiling.test_resultset.ResultSetTest.test_fetch_by_key_mappings x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_cextensions 3815
-test.aaa_profiling.test_resultset.ResultSetTest.test_fetch_by_key_mappings x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_nocextensions 15822
 test.aaa_profiling.test_resultset.ResultSetTest.test_fetch_by_key_mappings x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_cextensions 2649
 test.aaa_profiling.test_resultset.ResultSetTest.test_fetch_by_key_mappings x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_nocextensions 14656
 test.aaa_profiling.test_resultset.ResultSetTest.test_fetch_by_key_mappings x86_64_linux_cpython_3.11_sqlite_pysqlite_dbapiunicode_cextensions 2614
@@ -449,8 +443,6 @@ test.aaa_profiling.test_resultset.ResultSetTest.test_raw_string x86_64_linux_cpy
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_string x86_64_linux_cpython_3.11_mariadb_mysqldb_dbapiunicode_nocextensions 5307
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_string x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_cextensions 279
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_string x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_nocextensions 5281
-test.aaa_profiling.test_resultset.ResultSetTest.test_raw_string x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_cextensions 1504
-test.aaa_profiling.test_resultset.ResultSetTest.test_raw_string x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_nocextensions 6506
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_string x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_cextensions 299
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_string x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_nocextensions 5301
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_string x86_64_linux_cpython_3.11_sqlite_pysqlite_dbapiunicode_cextensions 272
@@ -462,8 +454,6 @@ test.aaa_profiling.test_resultset.ResultSetTest.test_raw_unicode x86_64_linux_cp
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_unicode x86_64_linux_cpython_3.11_mariadb_mysqldb_dbapiunicode_nocextensions 5307
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_unicode x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_cextensions 279
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_unicode x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_nocextensions 5281
-test.aaa_profiling.test_resultset.ResultSetTest.test_raw_unicode x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_cextensions 1504
-test.aaa_profiling.test_resultset.ResultSetTest.test_raw_unicode x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_nocextensions 6506
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_unicode x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_cextensions 299
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_unicode x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_nocextensions 5301
 test.aaa_profiling.test_resultset.ResultSetTest.test_raw_unicode x86_64_linux_cpython_3.11_sqlite_pysqlite_dbapiunicode_cextensions 272
@@ -475,8 +465,6 @@ test.aaa_profiling.test_resultset.ResultSetTest.test_string x86_64_linux_cpython
 test.aaa_profiling.test_resultset.ResultSetTest.test_string x86_64_linux_cpython_3.11_mariadb_mysqldb_dbapiunicode_nocextensions 5662
 test.aaa_profiling.test_resultset.ResultSetTest.test_string x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_cextensions 660
 test.aaa_profiling.test_resultset.ResultSetTest.test_string x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_nocextensions 5667
-test.aaa_profiling.test_resultset.ResultSetTest.test_string x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_cextensions 1806
-test.aaa_profiling.test_resultset.ResultSetTest.test_string x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_nocextensions 6813
 test.aaa_profiling.test_resultset.ResultSetTest.test_string x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_cextensions 640
 test.aaa_profiling.test_resultset.ResultSetTest.test_string x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_nocextensions 5647
 test.aaa_profiling.test_resultset.ResultSetTest.test_string x86_64_linux_cpython_3.11_sqlite_pysqlite_dbapiunicode_cextensions 605
@@ -488,8 +476,6 @@ test.aaa_profiling.test_resultset.ResultSetTest.test_unicode x86_64_linux_cpytho
 test.aaa_profiling.test_resultset.ResultSetTest.test_unicode x86_64_linux_cpython_3.11_mariadb_mysqldb_dbapiunicode_nocextensions 5662
 test.aaa_profiling.test_resultset.ResultSetTest.test_unicode x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_cextensions 660
 test.aaa_profiling.test_resultset.ResultSetTest.test_unicode x86_64_linux_cpython_3.11_mssql_pyodbc_dbapiunicode_nocextensions 5667
-test.aaa_profiling.test_resultset.ResultSetTest.test_unicode x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_cextensions 1806
-test.aaa_profiling.test_resultset.ResultSetTest.test_unicode x86_64_linux_cpython_3.11_oracle_oracledb_dbapiunicode_nocextensions 6813
 test.aaa_profiling.test_resultset.ResultSetTest.test_unicode x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_cextensions 640
 test.aaa_profiling.test_resultset.ResultSetTest.test_unicode x86_64_linux_cpython_3.11_postgresql_psycopg2_dbapiunicode_nocextensions 5647
 test.aaa_profiling.test_resultset.ResultSetTest.test_unicode x86_64_linux_cpython_3.11_sqlite_pysqlite_dbapiunicode_cextensions 605

diff --git a/test/requirements.py b/test/requirements.py
index 2e80884bc17aec686c9d779809c9b1c7692281d9..0dde542372a34579e54e0f33451db62e0d35db8a 100644 (file)
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -883,7 +883,7 @@ class DefaultRequirements(SuiteRequirements):
                     ),
                 ]
             )
-            + self.fail_on_oracledb_thin
+            + self.skip_on_oracledb_thin
         )
 
     @property
@@ -1878,14 +1878,14 @@ class DefaultRequirements(SuiteRequirements):
         )
 
     @property
-    def fail_on_oracledb_thin(self):
+    def skip_on_oracledb_thin(self):
         def go(config):
             if against(config, "oracle+oracledb"):
                 with config.db.connect() as conn:
                     return config.db.dialect.is_thin_mode(conn)
             return False
 
-        return fails_if(go)
+        return skip_if(go)
 
     @property
     def computed_columns(self):

diff --git a/tox.ini b/tox.ini
index a5b82c034b0c0a5f0d6778495246bc5cdcd7c797..e80fe4ccec0d307a1a21616e0080f6d4ba29282e 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -192,7 +192,7 @@ commands=
 deps=
      greenlet != 0.4.17
      importlib_metadata; python_version < '3.8'
-     mypy >= 1.6.0
+     mypy >= 1.6.0,<1.11.0   # temporary, REMOVE upper bound
 commands =
     mypy  {env:MYPY_COLOR} ./lib/sqlalchemy
     # pyright changes too often with not-exactly-correct errors
@@ -208,7 +208,7 @@ deps=
      pytest-xdist
      greenlet != 0.4.17
      importlib_metadata; python_version < '3.8'
-     mypy >= 1.2.0
+     mypy >= 1.2.0,<1.11.0
      patch==1.*
 extras=
      {[greenletextras]extras}