Clean up container specs

pbrisbin · pbrisbin · commit e3feb88237e7 · 2015-12-02T10:53:56.000-05:00
- Extract with_timeout helper
- Remove complex on_output stub, add the sleep to existing handler
diff --git a/spec/cc/analyzer/container_spec.rb b/spec/cc/analyzer/container_spec.rb
@@ -129,10 +129,7 @@ module CC::Analyzer
         end
 
         it "times out slow containers" do
-          old_timeout = ENV["CONTAINER_TIMEOUT_SECONDS"]
-          ENV["CONTAINER_TIMEOUT_SECONDS"] = "1"
-
-          begin
+          with_timeout(1) do
             listener = TestContainerListener.new
             listener.expects(:finished).never
             container = Container.new(
@@ -153,8 +150,6 @@ module CC::Analyzer
             @container_result.exit_status.wont_equal nil
             @container_result.duration.must_be :>=, 0
             @container_result.duration.must_be :<, 2_000
-          ensure
-            ENV["CONTAINER_TIMEOUT_SECONDS"] = old_timeout
           end
         end
 
@@ -171,24 +166,14 @@ module CC::Analyzer
             listener: listener,
           )
           container.on_output do |str|
+            sleep 0.5
             stdout_lines << str
           end
 
-          slow_read_stdout = Proc.new do |out|
-            Thread.new do
-              out.each_line(container.instance_variable_get(:@output_delimeter)) do |chunk|
-                sleep 0.5
-                output = chunk.chomp(container.instance_variable_get(:@output_delimeter))
-                container.instance_variable_get(:@on_output).call(output)
-              end
-            end
-          end
-          container.stub :read_stdout, slow_read_stdout do
-            run_container(container)
+          run_container(container)
 
-            assert_container_stopped
-            @container_result.timed_out?.must_equal false
-          end
+          assert_container_stopped
+          @container_result.timed_out?.must_equal false
         end
 
         it "stops containers that emit more than the configured maximum output bytes" do
@@ -277,5 +262,13 @@ def expect_spawn(args, status: nil, out: StringIO.new, err: StringIO.new)
 
       return [pid, out, err]
     end
+
+    def with_timeout(timeout)
+      old_timeout = ENV["CONTAINER_TIMEOUT_SECONDS"]
+      ENV["CONTAINER_TIMEOUT_SECONDS"] = timeout.to_s
+      yield
+    ensure
+      ENV["CONTAINER_TIMEOUT_SECONDS"] = old_timeout
+    end
   end
 end
