spec/zk/client_spec.rb in zk-1.4.2 vs spec/zk/client_spec.rb in zk-1.5.0

@@ -9,11 +9,11 @@
   describe :close! do
     describe 'from a threadpool thread' do
       include_context 'connection opts'
 
       before do
-        @zk = ZK::Client::Threaded.new(*connection_args).tap { |z| wait_until { z.connected? } }
+        @zk = ZK::Client::Threaded.new(*connection_args)
       end
 
       after do
         @zk.close! unless @zk.closed?
       end
@@ -21,12 +21,21 @@
       it %[should do the right thing and not fail] do
         # this is an extra special case where the user obviously hates us
 
         @zk.should be_kind_of(ZK::Client::Threaded) # yeah yeah, just be sure
 
+        shutdown_thread = nil
+
         @zk.defer do
-          @zk.close!
+          shutdown_thread = @zk.close!
         end
+
+        wait_while { shutdown_thread.nil? }
+
+        shutdown_thread.should_not be_nil
+        shutdown_thread.should be_kind_of(Thread)
+
+        shutdown_thread.join(5).should == shutdown_thread
 
         wait_until(5) { @zk.closed? }.should be_true 
       end
     end
   end