uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests: Simplify logic of UCommand::run.

Browse Source
This commit is contained in:
Valentin Lorentz
2016-04-03 11:46:33 +02:00
parent b3b8a1ea54
commit fe5bc47971
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/common/util.rs
+17 -21
View File
@@ -486,29 +486,25 @@ impl UCommand {
}
self.has_run = true;
log_info("run", &self.comm_string);
let prog = match self.stdin {
Some(ref input) => {
let mut result = self.raw
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(Stdio::piped())
.spawn()
.unwrap();
let mut result = self.raw
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(Stdio::piped())
.spawn()
.unwrap();
result.stdin
.take()
.unwrap_or_else(
|| panic!(
"Could not take child process stdin"))
.write_all(&input)
.unwrap_or_else(|e| panic!("{}", e));
if let Some(ref input) = self.stdin {
result.stdin
.take()
.unwrap_or_else(
|| panic!(
"Could not take child process stdin"))
.write_all(&input)
.unwrap_or_else(|e| panic!("{}", e));
}
let prog = result.wait_with_output().unwrap();
result.wait_with_output().unwrap()
}
None => {
self.raw.output().unwrap()
}
};
CmdResult {
success: prog.status.success(),
stdout: from_utf8(&prog.stdout).unwrap().to_string(),