From 5f6b931f9a55ea0013ffb9b685580b8a67f42461 Mon Sep 17 00:00:00 2001 From: Vivek Verma <137406113+vivekverma-arista@users.noreply.github.com> Date: Tue, 14 May 2024 09:47:45 +0530 Subject: [PATCH] Put back #11934, fix qos/test_qos_sai.py teardown for dualtor. (#12503) What is the motivation for this PR? qos/test_qos_sai.py fails at teardown failed on setup with "Failed: All critical services should be fully started! Regression introduced by #10651 for dualtor. How did you do it? The config_reload in the fixture dut_disable_ipv6 waits until all critical processes are up after issuing config reload command and it timeouts in case of dualtor because mux container doesn't come up. Mux container is disabled by another fixture stopServices in the same file. These two fixtures have no dependency on each other hence the execution can happen in any order, so if the teardown of dut_disable_ipv6 happens before stopServices then this issue is seen. This change ensures that the teardown of stopServices happens before dut_disable_ipv6 so that mux is no longer disabled at the time of config_reload. How did you verify/test it? Ran qos/test_qos_sai.py on Arista-7260CX3 platform with dualtor topology with 202305 and 202311 images. --- tests/qos/qos_sai_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qos/qos_sai_base.py b/tests/qos/qos_sai_base.py index 79ce59c7bff..4b61400e724 100644 --- a/tests/qos/qos_sai_base.py +++ b/tests/qos/qos_sai_base.py @@ -1271,7 +1271,7 @@ def updateIptables(self, duthosts, get_src_dst_asic_and_duts, swapSyncd_on_selec @pytest.fixture(scope='class') def stopServices( - self, duthosts, get_src_dst_asic_and_duts, + self, duthosts, get_src_dst_asic_and_duts, dut_disable_ipv6, swapSyncd_on_selected_duts, enable_container_autorestart, disable_container_autorestart, get_mux_status, # noqa F811 tbinfo, upper_tor_host, lower_tor_host, toggle_all_simulator_ports): # noqa F811 """