Skip to content

Commit e91016f

Browse files
committed
use separate declarations instead of fixture in test_session_manager mock conn
1 parent 4f52cc3 commit e91016f

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

test/unit/test_session_manager.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
from enum import Enum
55
from unittest import mock
66

7-
import pytest
8-
97
from snowflake.connector.network import SnowflakeRestful
108

119
try:
@@ -25,14 +23,6 @@ class OCSPMode(Enum):
2523
url_3 = f"https://{hostname_2}/rgm1-s-sfctst0/stages/another-url"
2624

2725

28-
@pytest.fixture
29-
def mock_conn():
30-
mock_conn = mock.Mock(name="test_session_manager::mock_conn")
31-
mock_conn.disable_request_pooling = False
32-
mock_conn._ocsp_mode = lambda: DEFAULT_OCSP_MODE
33-
return mock_conn
34-
35-
3626
def close_sessions(rest: SnowflakeRestful, num_session_pools: int) -> None:
3727
"""Helper function to call SnowflakeRestful.close(). Asserts close was called on all SessionPools."""
3828
with mock.patch("snowflake.connector.network.SessionPool.close") as close_mock:
@@ -54,7 +44,11 @@ def create_session(
5444

5545

5646
@mock.patch("snowflake.connector.network.SnowflakeRestful.make_requests_session")
57-
def test_no_url_multiple_sessions(make_session_mock, mock_conn):
47+
def test_no_url_multiple_sessions(make_session_mock):
48+
mock_conn = mock.Mock(name="test_no_url_multiple_sessions::mock_conn")
49+
mock_conn.disable_request_pooling = False
50+
mock_conn._ocsp_mode = lambda: DEFAULT_OCSP_MODE
51+
5852
rest = SnowflakeRestful(connection=mock_conn)
5953

6054
create_session(rest, 2)
@@ -71,7 +65,11 @@ def test_no_url_multiple_sessions(make_session_mock, mock_conn):
7165

7266

7367
@mock.patch("snowflake.connector.network.SnowflakeRestful.make_requests_session")
74-
def test_multiple_urls_multiple_sessions(make_session_mock, mock_conn):
68+
def test_multiple_urls_multiple_sessions(make_session_mock):
69+
mock_conn = mock.Mock(name="test_multiple_urls_multiple_sessions::mock_conn")
70+
mock_conn.disable_request_pooling = False
71+
mock_conn._ocsp_mode = lambda: DEFAULT_OCSP_MODE
72+
7573
rest = SnowflakeRestful(connection=mock_conn)
7674

7775
for url in [url_1, url_2, None]:
@@ -91,7 +89,11 @@ def test_multiple_urls_multiple_sessions(make_session_mock, mock_conn):
9189

9290

9391
@mock.patch("snowflake.connector.network.SnowflakeRestful.make_requests_session")
94-
def test_multiple_urls_reuse_sessions(make_session_mock, mock_conn):
92+
def test_multiple_urls_reuse_sessions(make_session_mock):
93+
mock_conn = mock.Mock(name="test_multiple_urls_reuse_sessions::mock_conn")
94+
mock_conn.disable_request_pooling = False
95+
mock_conn._ocsp_mode = lambda: DEFAULT_OCSP_MODE
96+
9597
rest = SnowflakeRestful(connection=mock_conn)
9698
for url in [url_1, url_2, url_3, None]:
9799
# create 10 sessions, one after another

0 commit comments

Comments
 (0)