RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

tests: Move part of UCommand::run to a new function

Browse source
This commit is contained in:
Valentin Lorentz 2016-04-02 16:41:59 +02:00
parent fe5bc47971
commit 4ba6ea7aad
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/common/util.rs
View file

@ -11,7 +11,7 @@ use std::os::unix::fs::symlink as symlink_file;
#[cfg(windows)] #[cfg(windows)]
use std::os::windows::fs::symlink_file; use std::os::windows::fs::symlink_file;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::{Command, Stdio}; use std::process::{Command, Stdio, Child};
use std::str::from_utf8; use std::str::from_utf8;
use std::ffi::OsStr; use std::ffi::OsStr;
use self::tempdir::TempDir; use self::tempdir::TempDir;
@ -480,7 +480,8 @@ impl UCommand {
Box::new(self) Box::new(self)
} }
pub fn run(&mut self) -> CmdResult { /// Spawns the command, feeds the stdin if any, and returns immediately.
pub fn run_no_wait(&mut self) -> Child {
if self.has_run { if self.has_run {
panic!(ALREADY_RUN); panic!(ALREADY_RUN);
} }
@ -503,7 +504,13 @@ impl UCommand {
.unwrap_or_else(|e| panic!("{}", e)); .unwrap_or_else(|e| panic!("{}", e));
} }
let prog = result.wait_with_output().unwrap(); result
}
/// Spawns the command, feeds the stdin if any, waits for the result
/// and returns it.
pub fn run(&mut self) -> CmdResult {
let prog = self.run_no_wait().wait_with_output().unwrap();
CmdResult { CmdResult {
success: prog.status.success(), success: prog.status.success(),