Skip to content

Commit 480f064

Browse files
fix tests relying on port and other specific values in parameters.py
1 parent d3aea87 commit 480f064

10 files changed

+271
-535
lines changed

test/integ/conftest.py

-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ def get_db_parameters(connection_name: str = "default") -> dict[str, Any]:
152152

153153
# testaccount connection info
154154
ret = {**DEFAULT_PARAMETERS, **chosen_connection}
155-
156155
# snowflake admin account. Not available in GH actions
157156
for k, v in CONNECTION_PARAMETERS_ADMIN.items():
158157
ret["sf_" + k] = v

test/integ/test_autocommit.py

+20-33
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
from __future__ import annotations
77

8-
import snowflake.connector
8+
import uuid
99

1010

1111
def exe0(cnx, sql):
1212
return cnx.cursor().execute(sql)
1313

1414

15-
def _run_autocommit_off(cnx, db_parameters):
15+
def _run_autocommit_off(cnx, name):
1616
"""Runs autocommit off test.
1717
1818
Args:
@@ -21,7 +21,7 @@ def _run_autocommit_off(cnx, db_parameters):
2121
"""
2222

2323
def exe(cnx, sql):
24-
return cnx.cursor().execute(sql.format(name=db_parameters["name"]))
24+
return cnx.cursor().execute(sql.format(name=name))
2525

2626
exe(
2727
cnx,
@@ -89,7 +89,7 @@ def exe(cnx, sql):
8989
assert res[0] == 2
9090

9191

92-
def _run_autocommit_on(cnx, db_parameters):
92+
def _run_autocommit_on(cnx, name):
9393
"""Run autocommit on test.
9494
9595
Args:
@@ -98,7 +98,7 @@ def _run_autocommit_on(cnx, db_parameters):
9898
"""
9999

100100
def exe(cnx, sql):
101-
return cnx.cursor().execute(sql.format(name=db_parameters["name"]))
101+
return cnx.cursor().execute(sql.format(name=name))
102102

103103
exe(
104104
cnx,
@@ -116,16 +116,18 @@ def exe(cnx, sql):
116116
assert res[0] == 4
117117

118118

119-
def test_autocommit_attribute(conn_cnx, db_parameters):
119+
def test_autocommit_attribute(conn_cnx):
120120
"""Tests autocommit attribute.
121121
122122
Args:
123123
conn_cnx: The database connection context.
124124
db_parameters: Database parameters.
125125
"""
126126

127+
name = "python_tests_" + str(uuid.uuid4()).replace("-", "_")
128+
127129
def exe(cnx, sql):
128-
return cnx.cursor().execute(sql.format(name=db_parameters["name"]))
130+
return cnx.cursor().execute(sql.format(name=name))
129131

130132
with conn_cnx() as cnx:
131133
exe(
@@ -136,9 +138,9 @@ def exe(cnx, sql):
136138
)
137139
try:
138140
cnx.autocommit(False)
139-
_run_autocommit_off(cnx, db_parameters)
141+
_run_autocommit_off(cnx, name)
140142
cnx.autocommit(True)
141-
_run_autocommit_on(cnx, db_parameters)
143+
_run_autocommit_on(cnx, name)
142144
finally:
143145
exe(
144146
cnx,
@@ -148,25 +150,18 @@ def exe(cnx, sql):
148150
)
149151

150152

151-
def test_autocommit_parameters(db_parameters):
153+
def test_autocommit_parameters(conn_cnx):
152154
"""Tests autocommit parameter.
153155
154156
Args:
155157
db_parameters: Database parameters.
156158
"""
159+
name = "python_tests_" + str(uuid.uuid4()).replace("-", "_")
157160

158161
def exe(cnx, sql):
159-
return cnx.cursor().execute(sql.format(name=db_parameters["name"]))
160-
161-
with snowflake.connector.connect(
162-
user=db_parameters["user"],
163-
password=db_parameters["password"],
164-
host=db_parameters["host"],
165-
port=db_parameters["port"],
166-
account=db_parameters["account"],
167-
protocol=db_parameters["protocol"],
168-
schema=db_parameters["schema"],
169-
database=db_parameters["database"],
162+
return cnx.cursor().execute(sql.format(name=name))
163+
164+
with conn_cnx(
170165
autocommit=False,
171166
) as cnx:
172167
exe(
@@ -175,20 +170,12 @@ def exe(cnx, sql):
175170
CREATE TABLE {name} (c1 boolean)
176171
""",
177172
)
178-
_run_autocommit_off(cnx, db_parameters)
179-
180-
with snowflake.connector.connect(
181-
user=db_parameters["user"],
182-
password=db_parameters["password"],
183-
host=db_parameters["host"],
184-
port=db_parameters["port"],
185-
account=db_parameters["account"],
186-
protocol=db_parameters["protocol"],
187-
schema=db_parameters["schema"],
188-
database=db_parameters["database"],
173+
_run_autocommit_off(cnx, name)
174+
175+
with conn_cnx(
189176
autocommit=True,
190177
) as cnx:
191-
_run_autocommit_on(cnx, db_parameters)
178+
_run_autocommit_on(cnx, name)
192179
exe(
193180
cnx,
194181
"""

0 commit comments

Comments
 (0)