From 1eef43293b745d9796db8118618db1cf98bb0190 Mon Sep 17 00:00:00 2001 From: mattdeekay <11141331+mattdeekay@users.noreply.github.com> Date: Wed, 12 Jul 2023 13:51:37 -0700 Subject: [PATCH] Fix socket timeout test (#144) Signed-off-by: Jesse Whitehouse Co-authored-by: Jesse Whitehouse --- CHANGELOG.md | 3 ++- tests/e2e/test_driver.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7930ba81..53236afc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/tests/e2e/test_driver.py b/tests/e2e/test_driver.py index c8713bf0..d6e7e1ed 100644 --- a/tests/e2e/test_driver.py +++ b/tests/e2e/test_driver.py @@ -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 @@ -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):