Skip to content

Commit 13b5adf

Browse files
bingwang-msStormLiangMS
authored andcommitted
[vstest] Only collect stdout of orchagent_restart_check in vstest (#2597)
* Only collect stdout of orchagent_restart_check in vstest
1 parent 2b9d94d commit 13b5adf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tests/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ def restart(self) -> None:
601601
self.check_ready_status_and_init_db()
602602

603603
def runcmd(self, cmd: str, include_stderr=True) -> Tuple[int, str]:
604-
res = self.ctn.exec_run(cmd)
604+
res = self.ctn.exec_run(cmd, stdout=True, stderr=include_stderr)
605605
exitcode = res.exit_code
606606
out = res.output.decode("utf-8")
607607

tests/test_storm_control.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def test_warm_restart_all_interfaces(self,dvs,testlog):
211211
dvs.warm_restart_swss("true")
212212

213213
# freeze orchagent for warm restart
214-
(exitcode, result) = dvs.runcmd("/usr/bin/orchagent_restart_check")
214+
(exitcode, result) = dvs.runcmd("/usr/bin/orchagent_restart_check", include_stderr=False)
215215
assert result == "RESTARTCHECK succeeded\n"
216216
time.sleep(2)
217217

0 commit comments

Comments
 (0)