spec/zk/client_spec.rb in zk-1.0.0 vs spec/zk/client_spec.rb in zk-1.1.0

@@ -1,22 +1,34 @@
 require 'spec_helper'
 
 describe ZK::Client::Threaded do
-  include_context 'threaded client connection'
-  it_should_behave_like 'client'
+  context do
+    include_context 'threaded client connection'
+    it_should_behave_like 'client'
+  end
 
   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? } }
+      end
+
+      after do
+        @zk.close! unless @zk.closed?
+      end
+
       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
 
         @zk.defer do
           @zk.close!
         end
 
-        wait_until { @zk.closed? }.should be_true 
+        wait_until(5) { @zk.closed? }.should be_true 
       end
     end
   end
 end