Resolve deprecations in OracleHook (#40199)

apache · Jun 12, 2024 · c1ffe45 · c1ffe45
1 parent f0b51cd
commit c1ffe45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/tests/deprecations_ignore.yml b/tests/deprecations_ignore.yml
@@ -341,20 +341,6 @@
 - tests/providers/mysql/operators/test_mysql.py::TestMySql::test_mysql_operator_test_multi
 - tests/providers/mysql/operators/test_mysql.py::TestMySql::test_overwrite_schema
 - tests/providers/mysql/operators/test_mysql.py::test_execute_openlineage_events
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_get_conn_events
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_get_conn_host
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_get_conn_host_alternative_port
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_get_conn_mode
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_get_conn_purity
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_oracledb_defaults_attributes_default_values
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_set_oracledb_defaults_attributes_extra
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_set_oracledb_defaults_attributes_extra_str
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_set_oracledb_defaults_attributes_params
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_set_thick_mode_extra
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_set_thick_mode_extra_str
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_set_thick_mode_params
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_thick_mode_defaults_to_false
-- tests/providers/oracle/hooks/test_oracle.py::TestOracleHookConn::test_thick_mode_dirs_defaults
 - tests/providers/postgres/hooks/test_postgres.py::TestPostgresHookConn::test_schema_kwarg_database_kwarg_compatibility
 - tests/providers/postgres/operators/test_postgres.py::test_parameters_are_templatized
 - tests/providers/postgres/operators/test_postgres.py::TestPostgres::test_overwrite_database

diff --git a/tests/providers/oracle/hooks/test_oracle.py b/tests/providers/oracle/hooks/test_oracle.py
@@ -32,7 +32,7 @@
 class TestOracleHookConn:
     def setup_method(self):
         self.connection = Connection(
-            login="login", password="password", host="host", schema="schema", port=1521
+            login="login", password="password", host="host", port=1521, extra='{"service_name": "schema"}'
         )
 
         self.db_hook = OracleHook()
@@ -47,7 +47,7 @@ def test_get_conn_host(self, mock_connect):
         assert args == ()
         assert kwargs["user"] == "login"
         assert kwargs["password"] == "password"
-        assert kwargs["dsn"] == "host:1521/schema"
+        assert kwargs["dsn"] == oracledb.makedsn("host", 1521, service_name="schema")
 
     @mock.patch("airflow.providers.oracle.hooks.oracle.oracledb.connect")
     def test_get_conn_host_alternative_port(self, mock_connect):
@@ -58,7 +58,7 @@ def test_get_conn_host_alternative_port(self, mock_connect):
         assert args == ()
         assert kwargs["user"] == "login"
         assert kwargs["password"] == "password"
-        assert kwargs["dsn"] == "host:1522/schema"
+        assert kwargs["dsn"] == oracledb.makedsn("host", self.connection.port, service_name="schema")
 
     @mock.patch("airflow.providers.oracle.hooks.oracle.oracledb.connect")
     def test_get_conn_sid(self, mock_connect):