From fc147de66937e6b633ceb32d5c885a7907ae191e Mon Sep 17 00:00:00 2001 From: Sonic Build Admin Date: Mon, 20 Oct 2025 07:03:06 +0000 Subject: [PATCH] Revert "Update expect_regex in test_duplicate_route to support bulk update mode" Reverts sonic-net/sonic-mgmt#20232 since it's blocking PR test --- tests/route/test_duplicate_route.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tests/route/test_duplicate_route.py b/tests/route/test_duplicate_route.py index c99803179d..a6ebed5147 100644 --- a/tests/route/test_duplicate_route.py +++ b/tests/route/test_duplicate_route.py @@ -92,23 +92,16 @@ def verify_expected_loganalyzer_logs( loganalyzer: Loganalyzer utility fixture """ expectRegex = [ - ".*ERR.* object key SAI_OBJECT_TYPE_ROUTE_ENTRY:.* already exists.*", + ".*ERR.* meta_sai_validate_route_entry:.* already exists.*", + ".*ERR.* status: SAI_STATUS_ITEM_ALREADY_EXISTS.*", ".*ERR.* addRoutePost: Failed to create route.*", + ".*ERR.* handleSaiFailure: Encountered failure in create operation, SAI API: SAI_API_ROUTE.*", ] - ignoreRegex = [ - ".*ERR.* create failed, object already exists.*", - ".*ERR.* bulkCreate: Failed to create object.*", - ".*ERR.* api SAI_COMMON_API_BULK_CREATE failed in syncd mode.*", - ".*ERR.* flush_creating_entries: EntityBulker.flush create entries failed.*", - ] if loganalyzer: # Skip if loganalyzer is disabled loganalyzer[enum_rand_one_per_hwsku_frontend_hostname].expect_regex.extend( expectRegex ) - loganalyzer[enum_rand_one_per_hwsku_frontend_hostname].ignore_regex.extend( - ignoreRegex - ) @pytest.fixture(scope="module", autouse=True)