Skip to content

Commit ccc303a

Browse files
committed
Parallelize test_sql.py - minor changes to engine teardown for CI health
1 parent 80c4138 commit ccc303a

File tree

1 file changed

+27
-7
lines changed

1 file changed

+27
-7
lines changed

pandas/tests/io/test_sql.py

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,14 +1066,20 @@ def iris_connect_and_per_test_id(request, iris_path):
10661066
"conn_name": conn_name,
10671067
}
10681068
sqlalchemy = pytest.importorskip("sqlalchemy")
1069-
if type(conn) == type("str"):
1069+
if isinstance(conn, str):
10701070
conn = sqlalchemy.create_engine(conn)
1071-
drop_view(view_uuid, conn)
1072-
drop_table(table_uuid, conn)
1073-
if isinstance(conn, sqlalchemy.Engine):
1071+
drop_view(view_uuid, conn)
1072+
drop_table(table_uuid, conn)
10741073
conn.dispose()
10751074
else:
1076-
conn.close()
1075+
drop_view(view_uuid, conn)
1076+
drop_table(table_uuid, conn)
1077+
if isinstance(conn, sqlalchemy.Engine):
1078+
conn.dispose()
1079+
if isinstance(conn, sqlalchemy.Connection):
1080+
Engine = conn.engine
1081+
conn.close()
1082+
Engine.dispose()
10771083

10781084

10791085

@@ -1191,7 +1197,16 @@ def connect_and_uuid_types(request, types_data):
11911197
}
11921198
if isinstance(conn, str):
11931199
conn = sqlalchemy.create_engine(conn)
1194-
drop_table_uuid_views(conn, table_uuid, view_uuid)
1200+
drop_table_uuid_views(conn, table_uuid, view_uuid)
1201+
conn.dispose()
1202+
else:
1203+
drop_table_uuid_views(conn, table_uuid, view_uuid)
1204+
if isinstance(conn, sqlalchemy.Engine):
1205+
conn.dispose()
1206+
if isinstance(conn, sqlalchemy.Connection):
1207+
Engine = conn.engine
1208+
conn.close()
1209+
Engine.dispose()
11951210

11961211

11971212
@pytest.fixture
@@ -1210,12 +1225,17 @@ def connect_and_uuid(request, types_data):
12101225
"conn_name": conn_name,
12111226
}
12121227
if isinstance(conn, str):
1213-
sqlalchemy = pytest.importorskip("sqlalchemy")
12141228
conn = sqlalchemy.create_engine(conn)
12151229
drop_table_uuid_views(conn, table_uuid, view_uuid)
12161230
conn.dispose()
12171231
else:
12181232
drop_table_uuid_views(conn, table_uuid, view_uuid)
1233+
if isinstance(conn, sqlalchemy.Engine):
1234+
conn.dispose()
1235+
if isinstance(conn, sqlalchemy.Connection):
1236+
Engine = conn.engine
1237+
conn.close()
1238+
Engine.dispose()
12191239

12201240

12211241

0 commit comments

Comments
 (0)