test+refactor: Move stdout_text to _utils

Author: KSXGitHub

tests/_utils.rs

@@ -17,7 +17,7 @@ use std::{
     fs::{create_dir, metadata, remove_dir_all, Metadata},
     io::Error,
     path::{Path, PathBuf},
-    process::Command,
+    process::{Command, Output},
 };
 
 /// Representation of a temporary filesystem item.
@@ -273,6 +273,26 @@ impl<'a> CommandList<'a> {
     }
 }
 
+pub fn stdout_text(
+    Output {
+        status,
+        stdout,
+        stderr,
+    }: Output,
+) -> String {
+    inspect_stderr(&stderr);
+    assert!(
+        status.success(),
+        "progress exits with non-zero status: {:?}",
+        status
+    );
+    stdout
+        .pipe(String::from_utf8)
+        .expect("parse stdout as UTF-8")
+        .trim()
+        .to_string()
+}
+
 pub fn inspect_stderr(stderr: &[u8]) {
     let text = String::from_utf8_lossy(stderr);
     let text = text.trim();

tests/json.rs

@@ -20,34 +20,14 @@ use pretty_assertions::assert_eq;
 use std::{
     convert::TryInto,
     io::Write,
-    process::{Command, Output, Stdio},
+    process::{Command, Stdio},
 };
 
 type SampleName = String;
 type SampleData = Bytes;
 type SampleReflection = Reflection<SampleName, SampleData>;
 type SampleTree = DataTree<SampleName, SampleData>;
 
-fn stdout_text(
-    Output {
-        status,
-        stdout,
-        stderr,
-    }: Output,
-) -> String {
-    inspect_stderr(&stderr);
-    assert!(
-        status.success(),
-        "progress exits with non-zero status: {:?}",
-        status
-    );
-    stdout
-        .pipe(String::from_utf8)
-        .expect("parse stdout as UTF-8")
-        .trim()
-        .to_string()
-}
-
 fn sample_tree() -> SampleTree {
     let dir = |name: &'static str, children: Vec<SampleTree>| {
         SampleTree::dir(name.to_string(), 1024.into(), children)