Skip to content

Fix socket timeout test #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susodapop merged 2 commits into from
Jul 12, 2023
Merged

Fix socket timeout test #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2f23e6
Goodness our retry behaviour is a mess.
Jul 12, 2023
5ae39f5
Merge branch 'main' into fix-socket-timeout-test
Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
- Fix: Revised SQLAlchemy dialect and examples for compatibility with SQLAlchemy==1.3.x (#173)
- Fix: oauth would fail if expired credentials appeared in ~/.netrc (#122)
- Fix: Python HTTP proxies were broken after switch to urllib3 (#158)
- Other: Relax pandas dependency constraint to allow ^2.0.0 (#164)
- Other: Connector now logs operation handle guids as hexadecimal instead of bytes (#170)
- Add support for Cloud Fetch
- Other: test_socket_timeout_user_defined e2e test was broken (#144)

## 2.7.0 (2023-06-26)

Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/test_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import pytz
import thrift
import pytest
from urllib3.connectionpool import ReadTimeoutError

import databricks.sql as sql
from databricks.sql import STRING, BINARY, NUMBER, DATETIME, DATE, DatabaseError, Error, OperationalError, RequestError
Expand Down Expand Up @@ -509,12 +510,11 @@ def test_socket_timeout(self):
def test_socket_timeout_user_defined(self):
# We expect to see a TimeoutError when the socket timeout is only
# 1 sec for a query that takes longer than that to process
with self.assertRaises(RequestError) as cm:
with self.assertRaises(ReadTimeoutError) as cm:
with self.cursor({"_socket_timeout": 1}) as cursor:
query = "select * from range(10000000)"
query = "select * from range(1000000000)"
cursor.execute(query)

self.assertIsInstance(cm.exception.args[1], TimeoutError)

def test_ssp_passthrough(self):
for enable_ansi in (True, False):
Expand Down