@@ -146,7 +146,7 @@ EOS options[:deployer] = deploy end - opts.on("-t", "--test-with=type", String, + opts.on("-T", "--test-with=type", String, "Select your test framework.", "Available test framworks: #{TEST_FRAMEWORKS.join(', ')}", "Defaults to: rspec") do |test| app_generators/daemon_kit/daemon_kit_generator.rb @@ -1,7 +1,6 @@ +DAEMON_ENV = 'test' unless defined?( DAEMON_ENV ) + require 'test/unit' -require 'timeout' -require 'shoulda' -require 'mocha' require File.dirname(__FILE__) + '/../config/environment' DaemonKit::Application.running! daemon_generators/test_unit/templates/test/test_helper.rb @@ -64,7 +64,7 @@ module DaemonKit initializer.after_daemonize end - def self.shutdown( clean = false ) + def self.shutdown( clean = false, do_exit = false ) return unless $daemon_kit_shutdown_hooks_ran.nil? $daemon_kit_shutdown_hooks_ran = true @@ -81,7 +81,8 @@ module DaemonKit log_exceptions if DaemonKit.configuration.backtraces && !clean DaemonKit.logger.warn "Shutting down #{DaemonKit.configuration.daemon_name}" - exit + + exit if do_exit end def initialize( configuration ) @@ -114,10 +115,10 @@ module DaemonKit if DaemonKit.configuration.user || DaemonKit.configuration.group euid = Process.euid - egid = Process.egid - uid = Process.uid - gid = Process.gid - DaemonKit.logger.info( "DaemonKit dropped privileges to: #{euid} (EUID), #{egid} (EGID), #{uid} (UID), #{gid} (GID)" ) + egid = Process.egid + uid = Process.uid + gid = Process.gid + DaemonKit.logger.info( "DaemonKit dropped privileges to: #{euid} (EUID), #{egid} (EGID), #{uid} (UID), #{gid} (GID)" ) end end @@ -191,7 +192,8 @@ module DaemonKit end def initialize_signal_traps - term_proc = Proc.new { DaemonKit::Initializer.shutdown( true ) } + # Only exit the process if we're not in the 'test' environment + term_proc = Proc.new { DaemonKit::Initializer.shutdown( true, DAEMON_ENV == 'test' ) } configuration.trap( 'INT', term_proc ) configuration.trap( 'TERM', term_proc ) at_exit { DaemonKit::Initializer.shutdown } lib/daemon_kit/initializer.rb 98c88d36748640b4d9710046399ff6a588479c1d Kenneth Kalmer kenneth.kalmer@gmail.com http://github.com/kennethkalmer/daemon-kit/commit/50c2bfc9c62478febcb0570372a4cf262ba72a8a 50c2bfc9c62478febcb0570372a4cf262ba72a8a 2009-09-16T15:34:19-07:00 2009-09-16T15:34:19-07:00 Got Test::Unit working 8a26537f8316fd88307ce7c7d82faf79df091d32 Kenneth Kalmer kenneth.kalmer@gmail.com