Skip to content

Commit 2014592

Browse files
committed
update conftest.remove_none_available_config to detect case of missing gatebin
1 parent 8226f7f commit 2014592

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

tests/conftest.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def return_ds(server=None):
375375
get_server_version(core._global_server()), "2.1"
376376
)
377377

378-
378+
# Detect if gatebin binaries are available
379379
IS_USING_GATEBIN = _try_use_gatebin()
380380

381381

@@ -419,8 +419,11 @@ def remove_none_available_config(configs, config_names):
419419
configs_out.append(conf)
420420
config_names_out.append(conf_name)
421421
elif running_docker:
422+
unavailable_configs = [core.AvailableServerConfigs.InProcessServer]
423+
if not IS_USING_GATEBIN:
424+
unavailable_configs.append(core.AvailableServerConfigs.GrpcServer)
422425
for conf, conf_name in zip(configs, config_names):
423-
if conf != core.AvailableServerConfigs.InProcessServer:
426+
if conf not in unavailable_configs:
424427
configs_out.append(conf)
425428
config_names_out.append(conf_name)
426429

0 commit comments

Comments
 (0)