Skip to content

Commit 37cf6b0

Browse files
authored
Fix style tests and add workaround to fix PR check for them (#7899)
1 parent ac738f9 commit 37cf6b0

File tree

9 files changed

+39
-35
lines changed

9 files changed

+39
-35
lines changed

.github/actions/test_ya/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ runs:
178178

179179
if [ true = ${{ inputs.run_tests }} ]; then
180180
params+=(-A)
181+
params+=(--retest)
181182
fi
182183

183184
params+=(

ydb/library/yql/tests/common/test_framework/yql_utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,12 +501,14 @@ def is_canonize_yt(cfg):
501501
return True
502502
return False
503503

504+
504505
def is_with_final_result_issues(cfg):
505506
for item in cfg:
506507
if item[0] == 'with_final_result_issues':
507508
return True
508509
return False
509510

511+
510512
def skip_test_if_required(cfg):
511513
for item in cfg:
512514
if item[0] == 'skip_test':

ydb/tests/fq/s3/test_compressions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def validate_result(self, result_set):
3333
assert result_set.rows[0].items[0].bytes_value == b"yq"
3434
assert result_set.rows[0].items[1].int32_value == 0
3535
assert result_set.rows[0].items[2].bytes_value == b"abc"
36-
36+
3737
def validate_result_csv(self, result_set):
3838
logging.debug(str(result_set))
3939
assert len(result_set.columns) == 3
@@ -106,7 +106,7 @@ def test_compression_inference(self, kikimr, s3, client, filename, compression,
106106
self.create_bucket_and_upload_file(filename, s3, kikimr)
107107
storage_connection_name = unique_prefix + "fruitbucket"
108108
client.create_storage_connection(storage_connection_name, "fbucket")
109-
109+
110110
sql = '''
111111
SELECT *
112112
FROM `{}`.`{}`
@@ -204,7 +204,7 @@ def test_invalid_compression(self, kikimr, s3, client, unique_prefix):
204204
assert (
205205
"Unknown compression: some_compression. Use one of: gzip, zstd, lz4, brotli, bzip2, xz" in describe_string
206206
)
207-
207+
208208
@yq_v2
209209
@pytest.mark.parametrize("client", [{"folder_id": "my_folder"}], indirect=True)
210210
def test_invalid_compression_inference(self, kikimr, s3, client, unique_prefix):

ydb/tests/fq/s3/test_formats.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def validate_result(self, result_set):
3838
assert result_set.rows[2].items[0].bytes_value == b"Pear"
3939
assert result_set.rows[2].items[1].int32_value == 15
4040
assert result_set.rows[2].items[2].int32_value == 33
41-
41+
4242
def validate_result_inference(self, result_set):
4343
logging.debug(str(result_set))
4444
assert len(result_set.columns) == 3

ydb/tests/fq/s3/test_s3_0.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def test_inference_null_column(self, kikimr, s3, client, unique_prefix):
192192
assert result_set.rows[2].items[1].text_value == ""
193193
assert result_set.rows[2].items[2].int64_value == 15
194194
assert sum(kikimr.control_plane.get_metering(1)) == 10
195-
195+
196196
@yq_v2
197197
@pytest.mark.parametrize("client", [{"folder_id": "my_folder"}], indirect=True)
198198
def test_inference_optional_types(self, kikimr, s3, client, unique_prefix):

ydb/tests/functional/tenants/test_tenants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,13 +407,13 @@ def _get_entry_schema(entry):
407407
permissions=[x.to_pb() for x in entry.permissions],
408408
)
409409

410-
if type(item) == ydb.scheme.Directory:
410+
if isinstance(item, ydb.scheme.Directory):
411411
d = dict(scheme_type='Directory')
412412
d.update(_get_entry_schema(item))
413413
d.update(dict(
414414
children=[convert(x) for x in item.children]
415415
))
416-
elif type(item) == ydb.scheme.SchemeEntry:
416+
elif isinstance(item, ydb.scheme.SchemeEntry):
417417
d = dict(scheme_type='SchemeEntry')
418418
d.update(_get_entry_schema(item))
419419
else:

ydb/tests/library/harness/kikimr_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,10 @@ def __init__(
392392
self.yaml_config["feature_flags"]['enable_temp_tables'] = True
393393
self.yaml_config["feature_flags"]['enable_table_pg_types'] = True
394394
self.yaml_config['feature_flags']['enable_uniq_constraint'] = True
395-
if not "local_pg_wire_config" in self.yaml_config:
395+
if "local_pg_wire_config" not in self.yaml_config:
396396
self.yaml_config["local_pg_wire_config"] = {}
397397

398-
ydb_pgwire_port=self.port_allocator.get_node_port_allocator(node_id).pgwire_port
398+
ydb_pgwire_port = self.port_allocator.get_node_port_allocator(node_id).pgwire_port
399399
self.yaml_config['local_pg_wire_config']['listening_port'] = ydb_pgwire_port
400400

401401
# https://github.com/ydb-platform/ydb/issues/5152

ydb/tests/tools/mdb_mock/__main__.py

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import yatest.common as yat
99
from library.python.testing.recipe import declare_recipe, set_env
10-
from library.recipes.common import find_free_ports, start_daemon
10+
from library.recipes.common import find_free_ports
1111

1212
logger = logging.getLogger('mdb_mock.recipe')
1313

@@ -18,17 +18,15 @@ async def clickhouse_handler(request):
1818
cluster_id = request.match_info['cluster_id']
1919

2020
if cluster_id == 'clickhouse_cluster_id':
21-
return web.Response(body=json.dumps(
22-
{
23-
'hosts': [
24-
{
25-
'name': 'clickhouse',
26-
'cluster_id': cluster_id,
27-
'health': 'ALIVE',
28-
'type': 'CLICKHOUSE'
29-
},
30-
]
31-
}))
21+
return web.Response(
22+
body=json.dumps(
23+
{
24+
'hosts': [
25+
{'name': 'clickhouse', 'cluster_id': cluster_id, 'health': 'ALIVE', 'type': 'CLICKHOUSE'},
26+
]
27+
}
28+
)
29+
)
3230

3331
return web.Response(body=json.dumps({}))
3432

@@ -37,19 +35,22 @@ async def postgresql_handler(request):
3735
cluster_id = request.match_info['cluster_id']
3836

3937
if cluster_id == 'postgresql_cluster_id':
40-
return web.Response(body=json.dumps(
41-
{
42-
'hosts': [
43-
{
44-
'name': 'postgresql',
45-
'services': [
46-
{
47-
'health': 'ALIVE',
48-
},
49-
],
50-
}
51-
]
52-
}))
38+
return web.Response(
39+
body=json.dumps(
40+
{
41+
'hosts': [
42+
{
43+
'name': 'postgresql',
44+
'services': [
45+
{
46+
'health': 'ALIVE',
47+
},
48+
],
49+
}
50+
]
51+
}
52+
)
53+
)
5354
return web.Response(body=json.dumps({}))
5455

5556

ydb/tools/cfg/static.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def mbus_enabled(self):
274274
@property
275275
def table_service_config(self):
276276
return self.__cluster_details.get_service("table_service_config")
277-
277+
278278
@property
279279
def column_shard_config(self):
280280
return self.__cluster_details.get_service("column_shard_config")

0 commit comments

Comments
 (0)