External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-01 17:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Make output capture optional

Browse Source 
Only some tests require the output for the tests to be captured so
default to not capturing the output to a pipe and instead make it
controllable.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-02-27 11:56:10 +00:00
parent dae7608b1e
commit 559b70cf0a
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/integration.rs
View File

@ -716,6 +716,7 @@ mod tests {
struct GuestCommand<'a> {
command: Command,
guest: &'a Guest<'a>,
capture_output: bool,
}
impl<'a> GuestCommand<'a> {
@ -723,14 +724,24 @@ mod tests {
Self {
command: Command::new("target/release/cloud-hypervisor"),
guest,
capture_output: false,
}
}
fn capture_output(&mut self) -> &mut Self {
self.capture_output = true;
self
}
fn spawn(&mut self) -> io::Result<Child> {
self.command
.stderr(Stdio::piped())
.stdout(Stdio::piped())
.spawn()
if self.capture_output {
self.command
.stderr(Stdio::piped())
.stdout(Stdio::piped())
.spawn()
} else {
self.command.spawn()
}
}
fn args<I, S>(&mut self, args: I) -> &mut Self
@ -1991,6 +2002,7 @@ mod tests {
.default_net()
.args(&["--serial", "null"])
.args(&["--console", "off"])
.capture_output()
.spawn()
.unwrap();
@ -2038,6 +2050,7 @@ mod tests {
.default_net()
.args(&["--serial", "tty"])
.args(&["--console", "off"])
.capture_output()
.spawn()
.unwrap();
@ -2137,6 +2150,7 @@ mod tests {
.default_disks()
.default_net()
.args(&["--console", "tty"])
.capture_output()
.spawn()
.unwrap();