Ok, 1.8.7, you're annoying me now. Fix for stray node creation in spec.

zk-ruby · Apr 23, 2012 · 6c0c9e6 · 6c0c9e6
1 parent 1414332
commit 6c0c9e6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/spec/z_k/client/multiplexed_spec.rb b/spec/z_k/client/multiplexed_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'shared/client_examples'
 
 describe 'ZK::Client::Multiplexed', :client => :multiplexed do
   before do

diff --git a/spec/z_k/client_spec.rb b/spec/z_k/client_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'shared/client_examples'
 
 describe ZK::Client::Threaded do
   include_context 'threaded client connection'

diff --git a/spec/z_k/election_spec.rb b/spec/z_k/election_spec.rb
@@ -162,21 +162,22 @@
             @obama.zk.close!
             wait_until { @palin_won }
 
-            zk = ZK.new('localhost:2181')
-            newbama = ZK::Election::Candidate.new(zk, @election_name, :data => @data1)
+            ZK.open('localhost:2181') do |zk|
+              newbama = ZK::Election::Candidate.new(zk, @election_name, :data => @data1)
 
-            win_again = false
+              win_again = false
 
-            newbama.on_winning_election do
-              win_again = true
-            end
+              newbama.on_winning_election do
+                win_again = true
+              end
 
-            newbama.vote!
-            wait_until { newbama.voted? }
+              newbama.vote!
+              wait_until { newbama.voted? }
 
-            newbama.should be_voted
-            win_again.should be_false
-            newbama.should_not be_leader
+              newbama.should be_voted
+              win_again.should be_false
+              newbama.should_not be_leader
+            end
           end
         end
       end