add some love coming from a @ph review

Conflicts:
	lib/lsit/suite.rb
	spec/lib/suite_spec.rb

Fixes elastic#7

Author: Pere Urbon-Bayes

lib/lsit/run.rb

@@ -43,8 +43,7 @@ def run(required_events_count, required_run_time, input_lines)
         puts("waiting for output reader to complete") if @debug
         reader.join
       end
-      p = percentile(stats.stats, 0.80)
-      [p, elapsed, real_events_count, start_time]
+      { :p => percentile(stats.stats, 0.80) , :elapsed => elapsed, :events_count => real_events_count, :start_time => start_time }
     end
   end
 

lib/lsit/suite.rb

@@ -23,9 +23,10 @@ def execute(debug=false)
         tests.each do |test|
           events  = test[:events].to_i
           time    = test[:time].to_i
+
           manager = runner.new(test_config(test[:config]), debug, install_path)
-          p, elapsed, events_count, start_time = manager.run(events, time, runner.read_input_file(test_input(test[:input])))
-          lines << "#{test[:name]}, #{start_time} #{"%.2f" % elapsed}, #{events_count}, #{"%.0f" % (events_count / elapsed)},#{p.last}, #{"%.0f" % (p.reduce(:+) / p.size)}"
+          metrics = manager.run(events, time, runner.read_input_file(test_input(test[:input])))
+          lines << formatter(test[:name], metrics)
         end
         lines
       rescue Errno::ENOENT => e
@@ -56,6 +57,12 @@ def default_config
         {'path' => '.', 'config' => '', 'input' => ''}
       end
 
+      def formatter(test_name, args={})
+        p      =   args[:p]
+        params = [ test_name, args[:start_time], args[:elapsed], args[:events_count],
+                   args[:events_count] / args[:elapsed], p.last, p.reduce(:+) / p.size ]
+        "%s, %.2f, %2.f, %0.f, %.0f, %2.f, %0.f" % params
+      end
     end
   end
 end

spec/lib/suite_spec.rb

@@ -8,16 +8,13 @@
   let(:serial_runner) { double('DummySerialRunner') }
   let(:runner)        { Runner }
 
+  let(:run_outcome)   { { :p => [2000] , :elapsed => 100, :events_count => 3000, :start_time => 12 } }
   subject(:manager) { LSit::Executor::Suite.new(suite_def, logstash_home, config, runner) }
 
-  before(:each) do
-    expect(runner).to receive(:headers) { [] }
-  end
-
   context "with a valid configuration" do
     before(:each) do
-      expect(serial_runner).to receive(:run).with(0, 5, anything()).ordered  { [[2000], 100, 3000] }
-      expect(serial_runner).to receive(:run).with(0, 10, anything()).ordered { [[2000], 100, 3000] }
+      expect(serial_runner).to receive(:run).with(0, 5, anything()).ordered  { run_outcome }
+      expect(serial_runner).to receive(:run).with(0, 10, anything()).ordered { run_outcome }
     end
     context "using a file" do