Skip to content

Fix ydb/tests to conform py2 syntax #29466

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
merged 1 commit into from
Nov 24, 2025
Merged

Fix ydb/tests to conform py2 syntax #29466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions ydb/tests/library/clients/kikimr_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,10 @@ def read_host_configs(self, domain=1):

response = self.send(request, 'BlobStorageConfig').BlobStorageConfigResponse
if not response.Success:
raise RuntimeError(f'read_host_config request failed: {response.ErrorDescription}')
raise RuntimeError('read_host_config request failed: %s' % response.ErrorDescription)
status = response.Status[0]
if not status.Success:
raise RuntimeError(f'read_host_config has failed status: {status.ErrorDescription}')
raise RuntimeError('read_host_config has failed status: %s' % status.ErrorDescription)

return status.HostConfig

Expand All @@ -321,10 +321,10 @@ def define_host_configs(self, host_configs, domain=1):

response = self.send(request, 'BlobStorageConfig').BlobStorageConfigResponse
if not response.Success:
raise RuntimeError(f'define_host_config request failed: {response.ErrorDescription}')
raise RuntimeError('define_host_config request failed: %s' % response.ErrorDescription)
for i, status in enumerate(response.Status):
if not status.Success:
raise RuntimeError(f'define_host_config has failed status[{i}]: {status}')
raise RuntimeError('define_host_config has failed status[%d]: %s' % (i, status))

def read_storage_pools(self, domain=1):
request = msgbus.TBlobStorageConfigRequest()
Expand All @@ -334,11 +334,11 @@ def read_storage_pools(self, domain=1):

response = self.send(request, 'BlobStorageConfig').BlobStorageConfigResponse
if not response.Success:
raise RuntimeError(f'read_storage_pools request failed: {response.ErrorDescription}')
raise RuntimeError('read_storage_pools request failed: %s' % response.ErrorDescription)

status = response.Status[0]
if not status.Success:
raise RuntimeError(f'read_storage_pools has failed status: {status.ErrorDescription}')
raise RuntimeError('read_storage_pools has failed status: %s' % status.ErrorDescription)

return status.StoragePool

Expand All @@ -360,10 +360,10 @@ def pdisk_set_all_active(self, pdisk_path=None, domain=1):
response = self.send(request, 'BlobStorageConfig').BlobStorageConfigResponse

if not response.Success:
raise RuntimeError(f'update_all_drive_status_active request failed: {response.ErrorDescription}')
raise RuntimeError('update_all_drive_status_active request failed: %s' % response.ErrorDescription)
for i, status in enumerate(response.Status):
if not status.Success:
raise RuntimeError(f'update_all_drive_status_active has failed status[{i}]: {status}')
raise RuntimeError('update_all_drive_status_active has failed status[%d]: %s' % (i, status))

def query_base_config(self, domain=1):
request = msgbus.TBlobStorageConfigRequest()
Expand All @@ -375,11 +375,11 @@ def query_base_config(self, domain=1):

response = self.send(request, 'BlobStorageConfig').BlobStorageConfigResponse
if not response.Success:
raise RuntimeError(f'query_base_config failed: {response.ErrorDescription}')
raise RuntimeError('query_base_config failed: %s' % response.ErrorDescription)

status = response.Status[0]
if not status.Success:
raise RuntimeError(f'query_base_config failed: {status.ErrorDescription}')
raise RuntimeError('query_base_config failed: %s' % status.ErrorDescription)

return status

Expand Down
2 changes: 1 addition & 1 deletion ydb/tests/library/harness/kikimr_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ def __add_bs_box(self):
if key == 'expected_slot_count':
drive_proto.PDiskConfig.ExpectedSlotCount = value
else:
raise KeyError(f"unknown pdisk_config option {key}")
raise KeyError("unknown pdisk_config option %s" % key)

cmd = request.Command.add()
cmd.DefineBox.BoxId = 1
Expand Down
Loading