features/steps/cli_steps.rb in flapjack-0.7.29 vs features/steps/cli_steps.rb in flapjack-0.7.30

@@ -5,42 +5,60 @@
 
 Given /^a file named "([^"]*)" with:$/ do |file_name, file_content|
   write_file(file_name, file_content)
 end
 
-When /^I ((?:re)?start|stop) flapjack( \(daemonised\))? with `(.+)`$/ do |start_stop_restart, daemonise, cmd|
+Given /^a fifo named "([^"]*)" exists$/ do |fifo_name|
+  create_fifo(fifo_name)
+end
+
+When /^I ((?:re)?start|stop) (\S+)( \(daemonised\))? with `(.+)`$/ do |start_stop_restart, exe, daemonise, cmd|
+  @daemons_output      ||= []
+  @daemons_exit_status ||= []
+
   @root = Pathname.new(File.dirname(__FILE__)).parent.parent.expand_path
   command = "#{@root.join('bin')}/#{cmd}"
 
+  # enable debugging output from spawn_process etc
+  #@debug = true
+
   case start_stop_restart
   when 'start'
     @process_h = spawn_process(command,
-                  :daemon_pidfile => (daemonise.nil? || daemonise.empty?) ? nil : 'tmp/cucumber_cli/flapjack_d.pid')
+                  :daemon_pidfile => (daemonise.nil? || daemonise.empty?) ? nil : "tmp/cucumber_cli/#{exe}_d.pid")
   when 'stop', 'restart'
-    `#{command}`
+    @daemons_output << `#{command}`
+    @daemons_exit_status << $?
   end
+  puts "output: #{@daemons_output.join(', ')}, exit statuses: #{@daemons_exit_status}" if @debug
 end
 
-When /^I send a SIG(\w+) to the flapjack process$/ do |signal|
+When /^I send a SIG(\w+) to the (?:\S+) process$/ do |signal|
   process = @process_h[:process]
   pid     = process ? process.pid : @process_h[:pid]
   Process.kill(signal, pid)
 end
 
-Then /^flapjack should ((?:re)?start|stop) within (\d+) seconds$/ do |start_stop_restart, seconds|
+Then /^(\S+) should ((?:re)?start|stop) within (\d+) seconds$/ do |exe, start_stop_restart, seconds|
   process = @process_h[:process]
   pid     = process ? process.pid : @process_h[:pid]
   running = nil
   attempts = 0
-  max_attempts = seconds.to_i * 200
+  max_attempts = seconds.to_i * 10
 
+  if @debug
+    puts "should #{start_stop_restart} within #{seconds} seconds..."
+    puts "pid:  #{pid}, max_attempts: #{max_attempts}"
+  end
+
   case start_stop_restart
   when 'start'
     begin
       Process.kill(0, pid)
       running = true
     rescue Errno::EINVAL, Errno::ESRCH, RangeError, Errno::EPERM => e
+      puts "rescued error from kill: #{e.class} - #{e.message}" if @debug
       attempts += 1; sleep 0.1; retry if attempts < max_attempts
       running = false
     end
     running.should be_true
   when 'stop'
@@ -68,10 +86,10 @@
     end
     running.should be_false
   when 'restart'
     read_pid = nil
     while attempts < max_attempts
-      time_and_pid = time_and_pid_from_file('tmp/cucumber_cli/flapjack_d.pid')
+      time_and_pid = time_and_pid_from_file("tmp/cucumber_cli/#{exe}_d.pid")
       read_pid = time_and_pid.last
       break if read_pid != pid
       attempts += 1; sleep 0.1
     end
     read_pid.should_not == pid