Skip to content
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

[vstest] Only collect stdout of orchagent_restart_check in vstest #2597

Merged
merged 2 commits into from
Jan 4, 2023
Merged

[vstest] Only collect stdout of orchagent_restart_check in vstest #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
053dd8c
Only collect stdout of orchagent_restart_check in vstest
bingwang-ms Jan 4, 2023
e70e953
Add uncommited change
bingwang-ms Jan 4, 2023
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
2 changes: 1 addition & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion tests/test_storm_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down