Merge pull request #21 from Zeegomo/fix-process-lines

Author: emilyalbini

CHANGELOG.md

@@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- Fix `Command::process_lines` not working in sandboxed enviroments. 
+
 ## [0.6.0] - 2020-04-01
 
 ### Added

src/cmd/mod.rs

@@ -345,7 +345,12 @@ impl<'w, 'pl> Command<'w, 'pl> {
                 .env("CARGO_HOME", container_dirs::CARGO_HOME.to_str().unwrap())
                 .env("RUSTUP_HOME", container_dirs::RUSTUP_HOME.to_str().unwrap());
 
-            builder.run(workspace, self.timeout, self.no_output_timeout)?;
+            builder.run(
+                workspace,
+                self.timeout,
+                self.no_output_timeout,
+                self.process_lines,
+            )?;
             Ok(ProcessOutput {
                 stdout: Vec::new(),
                 stderr: Vec::new(),

src/cmd/sandbox.rs

@@ -262,6 +262,7 @@ impl SandboxBuilder {
         workspace: &Workspace,
         timeout: Option<Duration>,
         no_output_timeout: Option<Duration>,
+        process_lines: Option<&mut dyn FnMut(&str)>,
     ) -> Result<(), Error> {
         let container = self.create(workspace)?;
 
@@ -276,7 +277,7 @@ impl SandboxBuilder {
             }
         }}
 
-        container.run(timeout, no_output_timeout)?;
+        container.run(timeout, no_output_timeout, process_lines)?;
         Ok(())
     }
 }
@@ -323,12 +324,18 @@ impl Container<'_> {
         &self,
         timeout: Option<Duration>,
         no_output_timeout: Option<Duration>,
+        process_lines: Option<&mut dyn FnMut(&str)>,
     ) -> Result<(), Error> {
-        let res = Command::new(self.workspace, "docker")
+        let mut cmd = Command::new(self.workspace, "docker")
             .args(&["start", "-a", &self.id])
             .timeout(timeout)
-            .no_output_timeout(no_output_timeout)
-            .run();
+            .no_output_timeout(no_output_timeout);
+
+        if let Some(f) = process_lines {
+            cmd = cmd.process_lines(f);
+        }
+
+        let res = cmd.run();
         let details = self.inspect()?;
 
         // Return a different error if the container was killed due to an OOM

tests/buildtest/mod.rs

@@ -23,6 +23,32 @@ fn test_hello_world() {
     });
 }
 
+#[test]
+fn test_process_lines() {
+    runner::run("hello-world", |run| {
+        run.build(SandboxBuilder::new().enable_networking(false), |build| {
+            let storage = rustwide::logging::LogStorage::new(LevelFilter::Info);
+            let mut ex = false;
+            rustwide::logging::capture(&storage, || -> Result<_, Error> {
+                build
+                    .cargo()
+                    .process_lines(&mut |line: &str| {
+                        if line.contains("Hello, world!") {
+                            ex = true;
+                        }
+                    })
+                    .args(&["run"])
+                    .run()?;
+                Ok(())
+            })?;
+
+            assert!(ex);
+            Ok(())
+        })?;
+        Ok(())
+    });
+}
+
 #[test]
 #[cfg(not(windows))]
 fn test_sandbox_oom() {