From 053dd8ceb351859b51bf2f0d6d79285332184fba Mon Sep 17 00:00:00 2001 From: bingwang Date: Wed, 4 Jan 2023 00:53:09 +0000 Subject: [PATCH 1/2] Only collect stdout of orchagent_restart_check in vstest --- tests/test_storm_control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_storm_control.py b/tests/test_storm_control.py index 76deef9268..ec4da04917 100644 --- a/tests/test_storm_control.py +++ b/tests/test_storm_control.py @@ -211,7 +211,7 @@ def test_warm_restart_all_interfaces(self,dvs,testlog): dvs.warm_restart_swss("true") # freeze orchagent for warm restart - (exitcode, result) = dvs.runcmd("/usr/bin/orchagent_restart_check") + (exitcode, result) = dvs.runcmd("/usr/bin/orchagent_restart_check", include_stderr=False) assert result == "RESTARTCHECK succeeded\n" time.sleep(2) From e70e953f4e0cfd9bc3b50d593af357f88480c1da Mon Sep 17 00:00:00 2001 From: bingwang Date: Wed, 4 Jan 2023 06:17:35 +0000 Subject: [PATCH 2/2] Add uncommited change --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 47bf9369b4..af95f49794 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -601,7 +601,7 @@ def restart(self) -> None: self.check_ready_status_and_init_db() def runcmd(self, cmd: str, include_stderr=True) -> Tuple[int, str]: - res = self.ctn.exec_run(cmd) + res = self.ctn.exec_run(cmd, stdout=True, stderr=include_stderr) exitcode = res.exit_code out = res.output.decode("utf-8")