Merge pull request #16 from notalex/OTWO-3218

OTWO-3218: Fix hung processes due to full io buffers

Author: Peter Degen-Portnoy

lib/scm/shellout.rb

@@ -9,18 +9,8 @@ def self.relay src, dst
   end 
 
   def self.execute(cmd)
-    out = ''
-    err = ''
-    exit_status = nil
-    Open3.popen3(cmd) { |stdin, stdout, stderr, wait_thread|
-      while line = stdout.gets
-        out << line
-      end
-      while line = stderr.gets
-        err << line
-      end
-      exit_status = wait_thread.value
-    }
+    out, err, exit_status = Open3.capture3(cmd)
+
     return exit_status, out, err
   end
 

test/unit/shellout_test.rb

@@ -0,0 +1,25 @@
+require_relative '../test_helper'
+
+class ShelloutTest < Scm::Test
+  def test_execute_must_pipe_the_results_accurately
+    status, out, err = Shellout.execute("ruby -e 'puts %[hello world]; STDERR.puts(%[some error])'")
+
+    assert_equal out, "hello world\n"
+    assert_equal err, "some error\n"
+    assert_equal status.success?, true
+  end
+
+  def test_execute_must_return_appropriate_status_for_a_failed_process
+    status, out, err = Shellout.execute("ruby -e 'exit(1)'")
+
+    assert_equal status.success?, false
+  end
+
+  def test_execute_must_not_hang_when_io_buffer_is_full
+    assert_nothing_raised do
+      Timeout::timeout(1) do
+        Shellout.execute("ruby -e 'STDERR.puts(%[some line\n] * 10000)'")
+      end
+    end
+  end
+end