fix for #210 - magazin run strategy must return test result

lib/spork/run_strategy/magazine.rb

@@ -96,8 +96,9 @@ def run(argv, stderr, stdout)
 
     puts "(#{slave.id_num}); slave.run..."; $stdout.flush
     begin
-      slave.run(argv,stderr,stdout)
+      result = slave.run(argv,stderr,stdout)
       puts "   -- (#{slave.id_num});run done"; $stdout.flush
+      result
     ensure
       restart_slave(id)
     end

lib/spork/run_strategy/magazine/magazine_slave.rb

@@ -19,8 +19,10 @@ def run(argv, stderr, stdout)
     $stdout, $stderr = stdout, stderr
     Spork.exec_each_run
     load @test_framework.helper_file
-    @test_framework.run_tests(argv, stderr, stdout)
+    result = @test_framework.run_tests(argv, stderr, stdout)
+    Spork.exec_after_each_run
     puts "  <-- Slave(#{@id_num}) run done!"; stdout.flush
+    result
   end
 
   def preload

spec/spork/run_strategy/forking_spec.rb

@@ -10,15 +10,15 @@
   it "returns the result of the run_tests method from the forked child" do
     create_helper_file
     @fake_framework.stub!(:run_tests).and_return("tests were ran")
-    @run_strategy.run("test", STDOUT, STDIN).should == "tests were ran"
+    @run_strategy.run("test", StringIO.new, StringIO.new).should == "tests were ran"
   end
 
   it "aborts the current running thread when another run is started" do
     create_helper_file
     @fake_framework.wait_time = 0.25
-    first_run = Thread.new { @run_strategy.run("test", STDOUT, STDIN).should == nil }
+    first_run = Thread.new { @run_strategy.run("test", StringIO.new, StringIO.new).should == nil }
     sleep(0.05)
-    @run_strategy.run("test", STDOUT, STDIN).should == true
+    @run_strategy.run("test", StringIO.new, StringIO.new).should == true
 
     # wait for the first to finish
     first_run.join
@@ -28,7 +28,7 @@
     create_helper_file
     @fake_framework.wait_time = 5
     started_at = Time.now
-    first_run = Thread.new { @run_strategy.run("test", STDOUT, STDIN).should == true }
+    first_run = Thread.new { @run_strategy.run("test", StringIO.new, StringIO.new).should == true }
     sleep(0.05)
     @run_strategy.send(:abort)
     sleep(0.01) while @run_strategy.running?

spec/spork/run_strategy/magazine/magazine_slave_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe MagazineSlave do
+  it '#run returns test result' do
+    fake_framework = FakeFramework.new
+    create_helper_file(fake_framework)
+    fake_framework.stub!(:run_tests).and_return(true)
+    slave = MagazineSlave.new(1, fake_framework.short_name)
+    slave.run('test', StringIO.new, StringIO.new).should be true
+  end
+end

spec/support/fake_framework.rb

@@ -14,4 +14,9 @@ def run_tests(argv, input, output)
     sleep(@wait_time || 0.5)
     true
   end
+
+  def preload
+    true
+  end
+
 end