Skip to content

Commit 5c22ec4

Browse files
kozlovbkozlovb
committed
Applied linter
1 parent 464b8fd commit 5c22ec4

File tree

3 files changed

+39
-31
lines changed

3 files changed

+39
-31
lines changed

‎sqlserver/datadog_checks/sqlserver/schemas.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ def _fetch_schema_data(self, cursor, db_name):
160160
)
161161
)
162162
raise StopIteration(
163-
"Schema collection took {}s which is longer than allowed limit of {}s, stopped while collecting for db - {}".format(
163+
"""Schema collection took {}s which is longer than allowed limit of {}s,
164+
stopped while collecting for db - {}""".format(
164165
schema_collection_elapsed_time, self._max_execution_time, db_name
165166
)
166167
)
@@ -183,12 +184,16 @@ def _fetch_for_databases(self):
183184
self._fetch_schema_data(cursor, db_name)
184185
except StopIteration as e:
185186
self._log.error(
186-
"While executing fetch schemas for databse {}, the following exception occured {}".format(db_name, e)
187+
"While executing fetch schemas for databse {}, the following exception occured {}".format(
188+
db_name, e
189+
)
187190
)
188191
return
189192
except Exception as e:
190193
self._log.error(
191-
"While executing fetch schemas for databse {}, the following exception occured {}".format(db_name, e)
194+
"While executing fetch schemas for databse {}, the following exception occured {}".format(
195+
db_name, e
196+
)
192197
)
193198
# Switch DB back to MASTER
194199
if not is_azure_sql_database(engine_edition):
@@ -259,9 +264,7 @@ def _query_db_information(self, db_names):
259264
with self._check.connection.open_managed_default_connection():
260265
with self._check.connection.get_managed_cursor() as cursor:
261266
db_names_formatted = ",".join(["'{}'".format(t) for t in db_names])
262-
return execute_query(
263-
DB_QUERY.format(db_names_formatted), cursor, convert_results_to_str=True
264-
)
267+
return execute_query(DB_QUERY.format(db_names_formatted), cursor, convert_results_to_str=True)
265268

266269
@tracked_method(agent_check_getter=agent_check_getter, track_result_length=True)
267270
def _get_tables(self, schema, cursor):
@@ -271,9 +274,7 @@ def _get_tables(self, schema, cursor):
271274
"name": str
272275
"columns": []
273276
"""
274-
tables_info = execute_query(
275-
TABLES_IN_SCHEMA_QUERY, cursor, convert_results_to_str=True, parameter=schema["id"]
276-
)
277+
tables_info = execute_query(TABLES_IN_SCHEMA_QUERY, cursor, convert_results_to_str=True, parameter=schema["id"])
277278
for t in tables_info:
278279
t.setdefault("columns", [])
279280
return tables_info

‎sqlserver/datadog_checks/sqlserver/utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
# Licensed under a 3-clause BSD style license (see LICENSE)
44
import os
55
import re
6+
from typing import Dict
67

78
from datadog_checks.base.utils.platform import Platform
89
from datadog_checks.sqlserver.const import ENGINE_EDITION_AZURE_MANAGED_INSTANCE, ENGINE_EDITION_SQL_DATABASE
910

10-
from typing import Dict
11-
1211
CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
1312
DRIVER_CONFIG_DIR = os.path.join(CURRENT_DIR, 'data', 'driver_config')
1413

‎sqlserver/tests/test_unit.py

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
from datadog_checks.sqlserver import SQLServer
1616
from datadog_checks.sqlserver.connection import split_sqlserver_host_port
1717
from datadog_checks.sqlserver.metrics import SqlFractionMetric, SqlMasterDatabaseFileStats
18-
from datadog_checks.sqlserver.schemas import SubmitData
19-
from datadog_checks.sqlserver.schemas import Schemas
18+
from datadog_checks.sqlserver.schemas import Schemas, SubmitData
2019
from datadog_checks.sqlserver.sqlserver import SQLConnectionError
2120
from datadog_checks.sqlserver.utils import (
2221
Database,
@@ -25,8 +24,6 @@
2524
set_default_driver_conf,
2625
)
2726

28-
from cachetools import TTLCache
29-
3027
from .common import CHECK_NAME, DOCKER_SERVER, assert_metrics
3128
from .utils import windows_ci
3229

@@ -809,13 +806,14 @@ def test_submit_data():
809806
)
810807
assert len(difference) == 0
811808

809+
812810
def test_submit_data_for_db_without_info():
813811

814812
dataSubmitter, submitted_data = set_up_submitter_unit_test()
815813

816814
schema1 = {"id": "1"}
817815
dataSubmitter.store("test_db1", schema1, [1, 2], 5)
818-
816+
819817
dataSubmitter.submit()
820818
expected_data = {
821819
"host": "some",
@@ -837,36 +835,46 @@ def test_submit_data_for_db_without_info():
837835
)
838836
assert len(difference) == 0
839837

838+
840839
def test_fetch_throws(instance_docker):
841840
check = SQLServer(CHECK_NAME, {}, [instance_docker])
842841
schemas = Schemas(check, check._config)
843-
with mock.patch('time.time', side_effect=[0, 9999999]), \
844-
mock.patch('datadog_checks.sqlserver.schemas.Schemas._query_schema_information', return_value = {"id" :1}), \
845-
mock.patch('datadog_checks.sqlserver.schemas.Schemas._get_tables', return_value = [1,2]):
842+
with mock.patch('time.time', side_effect=[0, 9999999]), mock.patch(
843+
'datadog_checks.sqlserver.schemas.Schemas._query_schema_information', return_value={"id": 1}
844+
), mock.patch('datadog_checks.sqlserver.schemas.Schemas._get_tables', return_value=[1, 2]):
846845
with pytest.raises(StopIteration):
847846
schemas._fetch_schema_data("dummy_cursor", "my_db")
848847

848+
849849
def test_submit_is_called_if_too_many_columns(instance_docker):
850850
check = SQLServer(CHECK_NAME, {}, [instance_docker])
851851
schemas = Schemas(check, check._config)
852-
with mock.patch('time.time', side_effect=[0, 0]), \
853-
mock.patch('datadog_checks.sqlserver.schemas.Schemas._query_schema_information', return_value = {"id" :1}), \
854-
mock.patch('datadog_checks.sqlserver.schemas.Schemas._get_tables', return_value = [1,2]), \
855-
mock.patch('datadog_checks.sqlserver.schemas.SubmitData.submit') as mocked_submit, \
856-
mock.patch('datadog_checks.sqlserver.schemas.Schemas._get_tables_data', return_value = (1000_000, {"id" : 1})):
852+
with mock.patch('time.time', side_effect=[0, 0]), mock.patch(
853+
'datadog_checks.sqlserver.schemas.Schemas._query_schema_information', return_value={"id": 1}
854+
), mock.patch('datadog_checks.sqlserver.schemas.Schemas._get_tables', return_value=[1, 2]), mock.patch(
855+
'datadog_checks.sqlserver.schemas.SubmitData.submit'
856+
) as mocked_submit, mock.patch(
857+
'datadog_checks.sqlserver.schemas.Schemas._get_tables_data', return_value=(1000_000, {"id": 1})
858+
):
857859
with pytest.raises(StopIteration):
858860
schemas._fetch_schema_data("dummy_cursor", "my_db")
859861
mocked_submit.called_once()
860862

863+
861864
def test_exception_handling_by_do_for_dbs(instance_docker):
862865
check = SQLServer(CHECK_NAME, {}, [instance_docker])
863866
check.initialize_connection()
864867
schemas = Schemas(check, check._config)
865868
mock_cursor = mock.MagicMock()
866-
with mock.patch('datadog_checks.sqlserver.schemas.Schemas._fetch_schema_data', side_effect=Exception("Can't connect to DB")), \
867-
mock.patch('datadog_checks.sqlserver.sqlserver.SQLServer.get_databases', return_value = ["db1"]), \
868-
mock.patch('cachetools.TTLCache.get', return_value = "dummy"), \
869-
mock.patch('datadog_checks.sqlserver.connection.Connection.open_managed_default_connection'), \
870-
mock.patch('datadog_checks.sqlserver.connection.Connection.get_managed_cursor', return_value = mock_cursor), \
871-
mock.patch('datadog_checks.sqlserver.utils.is_azure_sql_database', return_value = {}):
872-
schemas._fetch_for_databases()
869+
with mock.patch(
870+
'datadog_checks.sqlserver.schemas.Schemas._fetch_schema_data', side_effect=Exception("Can't connect to DB")
871+
), mock.patch('datadog_checks.sqlserver.sqlserver.SQLServer.get_databases', return_value=["db1"]), mock.patch(
872+
'cachetools.TTLCache.get', return_value="dummy"
873+
), mock.patch(
874+
'datadog_checks.sqlserver.connection.Connection.open_managed_default_connection'
875+
), mock.patch(
876+
'datadog_checks.sqlserver.connection.Connection.get_managed_cursor', return_value=mock_cursor
877+
), mock.patch(
878+
'datadog_checks.sqlserver.utils.is_azure_sql_database', return_value={}
879+
):
880+
schemas._fetch_for_databases()

0 commit comments

Comments
 (0)