From de28ea585d7f40720509a4499345401d70a742ad Mon Sep 17 00:00:00 2001
From: Eric Lindvall <eric@5stops.com>
Date: Fri, 16 Dec 2011 16:49:01 -0800
Subject: [PATCH] Remove Thread.join stubbing in test_god.rb

Splits God.start into God.start and God.join to allow for testing of God.start
---
 lib/god.rb       | 9 ++++++---
 test/test_god.rb | 5 -----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/god.rb b/lib/god.rb
index 491eb970..89a0bf62 100644
--- a/lib/god.rb
+++ b/lib/god.rb
@@ -658,10 +658,12 @@ def self.start
         sleep 60
       end
     end
-    
-    self.main.join
   end
-  
+
+  def self.join
+    self.main.join if self.main
+  end
+
   def self.version
     God::VERSION
   end
@@ -671,6 +673,7 @@ def self.version
   # Returns nothing
   def self.at_exit
     self.start
+    self.join
   end
   
   # private
diff --git a/test/test_god.rb b/test/test_god.rb
index f6758ad5..18ffe408 100644
--- a/test/test_god.rb
+++ b/test/test_god.rb
@@ -5,7 +5,6 @@ def setup
     God::Socket.stubs(:new).returns(true)
     God.stubs(:setup).returns(true)
     God.stubs(:validater).returns(true)
-    Thread.any_instance.stubs(:join).returns(true)
     God.reset
     God.pid_file_directory = '/var/run/god'
   end
@@ -273,7 +272,6 @@ def test_control_should_monitor_on_start
     w = God.watches['foo']
     w.expects(:monitor)
     God.control('foo', 'start')
-    Thread.pass
   end
   
   def test_control_should_move_to_restart_on_restart
@@ -282,7 +280,6 @@ def test_control_should_move_to_restart_on_restart
     w = God.watches['foo']
     w.expects(:move).with(:restart)
     God.control('foo', 'restart')
-    Thread.pass
   end
   
   def test_control_should_unmonitor_and_stop_on_stop
@@ -293,7 +290,6 @@ def test_control_should_unmonitor_and_stop_on_stop
     w.expects(:unmonitor).returns(w)
     w.expects(:action).with(:stop)
     God.control('foo', 'stop')
-    Thread.pass
   end
   
   def test_control_should_unmonitor_on_unmonitor
@@ -303,7 +299,6 @@ def test_control_should_unmonitor_on_unmonitor
     w.state = :up
     w.expects(:unmonitor).returns(w)
     God.control('foo', 'unmonitor')
-    Thread.pass
   end
   
   def test_control_should_unwatch_on_remove