Skip to content

Skip BGP check in teardown if --skip-sanity is used #18408

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
yejianquan merged 1 commit into from
Jul 3, 2025
+5 −3
Merged

Skip BGP check in teardown if --skip-sanity is used #18408

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
8 changes: 5 additions & 3 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2489,7 +2489,7 @@ def collect_db_dump(request, duthosts):
collect_db_dump_on_duts(request, duthosts)


def restore_config_db_and_config_reload(duts_data, duthosts):
def restore_config_db_and_config_reload(duts_data, duthosts, request):
# First copy the pre_running_config to the config_db.json files
for duthost in duthosts:
logger.info("dut reload called on {}".format(duthost.hostname))
Expand All @@ -2505,11 +2505,13 @@ def restore_config_db_and_config_reload(duts_data, duthosts):
duthost.copy(src=asic_cfg_file, dest='/etc/sonic/config_db{}.json'.format(asic_index), verbose=False)
os.remove(asic_cfg_file)

wait_for_bgp = False if request.config.getoption("skip_sanity") else True

# Second execute config reload on all duthosts
with SafeThreadPoolExecutor(max_workers=8) as executor:
for duthost in duthosts:
executor.submit(config_reload, duthost, wait_before_force_reload=300, safe_reload=True,
check_intf_up_ports=True, wait_for_bgp=True)
check_intf_up_ports=True, wait_for_bgp=wait_for_bgp)


def compare_running_config(pre_running_config, cur_running_config):
Expand Down Expand Up @@ -2817,7 +2819,7 @@ def _remove_entry(table_name, key_name, config):
logger.warning("Core dump or config check failed for {}, results: {}"
.format(module_name, json.dumps(check_result)))

restore_config_db_and_config_reload(duts_data, duthosts)
restore_config_db_and_config_reload(duts_data, duthosts, request)
else:
logger.info("Core dump and config check passed for {}".format(module_name))

Expand Down
Loading