Skip to content

Commit 93b30af

Browse files
authored
fix htap tests on jenkins (#1576)
* fix htap tests on jenkins #1 * fix htap tests on jenkins #2 * re-add pytest.mark.internal
1 parent 4d40b70 commit 93b30af

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

test/integ/test_session_parameters.py

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99

1010
import snowflake.connector
1111

12-
from .conftest import TEST_SCHEMA
12+
try:
13+
from snowflake.connector.util_text import random_string
14+
except ImportError:
15+
from ..randomize import random_string
1316

1417
try: # pragma: no cover
1518
from ..parameters import CONNECTION_PARAMETERS_ADMIN
@@ -121,16 +124,24 @@ def set_backend_client_session_keep_alive(
121124

122125
@pytest.mark.internal
123126
def test_htap_optimizations(db_parameters: object, conn_cnx) -> None:
127+
random_prefix = random_string(5, "test_prefix").lower()
128+
test_wh = f"{random_prefix}_wh"
129+
test_db = f"{random_prefix}_db"
130+
test_schema = f"{random_prefix}_schema"
131+
124132
with conn_cnx("admin") as admin_cnx:
125133
try:
126-
admin_cnx.cursor().execute(f"CREATE SCHEMA IF NOT EXISTS {TEST_SCHEMA}")
134+
admin_cnx.cursor().execute(f"CREATE WAREHOUSE IF NOT EXISTS {test_wh}")
135+
admin_cnx.cursor().execute(f"USE WAREHOUSE {test_wh}")
136+
admin_cnx.cursor().execute(f"CREATE DATABASE IF NOT EXISTS {test_db}")
137+
admin_cnx.cursor().execute(f"CREATE SCHEMA IF NOT EXISTS {test_schema}")
127138
query = f"alter account {db_parameters['sf_account']} set ENABLE_SNOW_654741_FOR_TESTING=true"
128139
admin_cnx.cursor().execute(query)
129140

130141
# assert wh, db, schema match conn params
131-
assert admin_cnx._warehouse.lower() == db_parameters["sf_warehouse"].lower()
132-
assert admin_cnx._database.lower() == db_parameters["sf_database"].lower()
133-
assert admin_cnx._schema.lower() == TEST_SCHEMA
142+
assert admin_cnx._warehouse.lower() == test_wh
143+
assert admin_cnx._database.lower() == test_db
144+
assert admin_cnx._schema.lower() == test_schema
134145

135146
# alter session set TIMESTAMP_OUTPUT_FORMAT='YYYY-MM-DD HH24:MI:SS.FFTZH'
136147
admin_cnx.cursor().execute(
@@ -151,9 +162,9 @@ def test_htap_optimizations(db_parameters: object, conn_cnx) -> None:
151162
assert len(ret) == 3
152163

153164
# assert wh, db, schema
154-
assert admin_cnx._warehouse.lower() == db_parameters["sf_warehouse"].lower()
155-
assert admin_cnx._database.lower() == db_parameters["sf_database"].lower()
156-
assert admin_cnx._schema.lower() == TEST_SCHEMA
165+
assert admin_cnx._warehouse.lower() == test_wh
166+
assert admin_cnx._database.lower() == test_db
167+
assert admin_cnx._schema.lower() == test_schema
157168

158169
assert (
159170
admin_cnx._session_parameters["TIMESTAMP_OUTPUT_FORMAT"]
@@ -166,3 +177,6 @@ def test_htap_optimizations(db_parameters: object, conn_cnx) -> None:
166177
# alter account unset ENABLE_SNOW_654741_FOR_TESTING
167178
query = f"alter account {db_parameters['sf_account']} unset ENABLE_SNOW_654741_FOR_TESTING"
168179
admin_cnx.cursor().execute(query)
180+
admin_cnx.cursor().execute(f"DROP SCHEMA IF EXISTS {test_schema}")
181+
admin_cnx.cursor().execute(f"DROP DATABASE IF EXISTS {test_db}")
182+
admin_cnx.cursor().execute(f"DROP WAREHOUSE IF EXISTS {test_wh}")

0 commit comments

Comments
 (0)