Skip to content

Commit 6b063d2

Browse files
committed
Minor cleanup of ClickHouse test.
1 parent 8449046 commit 6b063d2

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

tests/test_clickhouse.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ def test_query(self, mock_connect: Mock):
5656
@patch("clickhouse_connect.dbapi.connect")
5757
def test_datetime_query(self, mock_connect: Mock):
5858
query = "SELECT name, created_date, updated_datetime FROM table" # noqa
59-
data = [
59+
expected_data = [
6060
[
6161
"name_1",
6262
datetime.date.fromisoformat("2023-11-01"),
6363
datetime.datetime.fromisoformat("2023-11-01T10:59:00"),
6464
],
6565
]
66-
description = [
66+
expected_description = [
6767
["name", "String", None, None, None, None, None],
6868
["created_date", "Date", None, None, None, None, None],
6969
["updated_datetime", "DateTime", None, None, None, None, None],
7070
]
71-
self._test_run_query(mock_connect, query, data, description)
71+
self._test_run_query(mock_connect, query, expected_data, expected_description)
7272

7373
def _test_run_query(
7474
self,
@@ -108,13 +108,13 @@ def _test_run_query(
108108
}
109109
mock_connect.return_value = self._mock_connection
110110

111-
expected_rows = len(data)
111+
rowcount = len(data)
112112

113113
if raise_exception:
114114
self._mock_cursor.execute.side_effect = raise_exception
115115
self._mock_cursor.fetchall.return_value = data
116116
self._mock_cursor.description.return_value = description
117-
self._mock_cursor.rowcount.return_value = expected_rows
117+
self._mock_cursor.rowcount.return_value = rowcount
118118

119119
response = self._agent.execute_operation(
120120
"clickhouse",
@@ -137,7 +137,6 @@ def _test_run_query(
137137
self.assertIsNone(response.result.get(ATTRIBUTE_NAME_ERROR))
138138
self.assertTrue(ATTRIBUTE_NAME_RESULT in response.result)
139139
result = response.result.get(ATTRIBUTE_NAME_RESULT)
140-
print(result)
141140

142141
mock_connect.assert_called_with(
143142
**_CLICKHOUSE_CREDENTIALS,
@@ -158,7 +157,7 @@ def _test_run_query(
158157
self.assertEqual(description, result["description"])
159158

160159
self.assertTrue("rowcount" in result)
161-
self.assertEqual(expected_rows, result["rowcount"])
160+
self.assertEqual(rowcount, result["rowcount"])
162161

163162
@classmethod
164163
def _serialized_data(cls, data: List) -> List:

0 commit comments

Comments
 (0)