clean up connections in specs where we can

Author: brianmario

spec/em/em_spec.rb

@@ -12,13 +12,15 @@
         defer1 = client1.query "SELECT sleep(0.1) as first_query"
         defer1.callback do |result|
           results << result.first
+          client1.close
           EM.stop_event_loop
         end
 
         client2 = Mysql2::EM::Client.new DatabaseCredentials['root']
         defer2 = client2.query "SELECT sleep(0.025) second_query"
         defer2.callback do |result|
           results << result.first
+          client2.close
         end
       end
 
@@ -36,6 +38,7 @@
           defer2 = client.query "SELECT sleep(0.025) as second_query"
           defer2.callback do |r|
             results << r.first
+            client.close
             EM.stop_event_loop
           end
         end
@@ -51,6 +54,7 @@
           client = Mysql2::EM::Client.new DatabaseCredentials['root']
           defer = client.query "SELECT sleep(0.1) as first_query"
           defer.callback do |result|
+            client.close
             raise 'some error'
           end
           defer.errback do |err|

spec/mysql2/client_spec.rb

@@ -2,10 +2,6 @@
 require 'spec_helper'
 
 describe Mysql2::Client do
-  before(:each) do
-    @client = Mysql2::Client.new DatabaseCredentials['root']
-  end
-
   it "should raise an exception upon connection failure" do
     lambda {
       # The odd local host IP address forces the mysql client library to
@@ -88,6 +84,8 @@ def connect *args
     results[1]['Value'].should_not be_nil
     results[1]['Value'].should be_kind_of(String)
     results[1]['Value'].should_not be_empty
+
+    ssl_client.close
   end
 
   it "should respond to #close" do

spec/mysql2/error_spec.rb

@@ -3,18 +3,22 @@
 
 describe Mysql2::Error do
   before(:each) do
-    @client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
     begin
-      @client.query("HAHAHA")
+      client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
+      client.query("HAHAHA")
     rescue Mysql2::Error => e
       @error = e
+    ensure
+      client.close
     end
 
-    @client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
     begin
-      @client2.query("HAHAHA")
+      client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
+      client.query("HAHAHA")
     rescue Mysql2::Error => e
       @error2 = e
+    ensure
+      client.close
     end
   end
 

spec/mysql2/result_spec.rb

@@ -2,10 +2,6 @@
 require 'spec_helper'
 
 describe Mysql2::Result do
-  before(:each) do
-    @client = Mysql2::Client.new DatabaseCredentials['root']
-  end
-
   before(:each) do
     @result = @client.query "SELECT 1"
   end
@@ -330,6 +326,7 @@
           client2.query "USE test"
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           result['enum_test'].encoding.should eql(Encoding.find('us-ascii'))
+          client2.close
         end
 
         it "should use Encoding.default_internal" do
@@ -359,6 +356,7 @@
           client2.query "USE test"
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           result['set_test'].encoding.should eql(Encoding.find('us-ascii'))
+          client2.close
         end
 
         it "should use Encoding.default_internal" do
@@ -441,6 +439,7 @@
               client2.query "USE test"
               result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
               result[field].encoding.should eql(Encoding.find('us-ascii'))
+              client2.close
             end
 
             it "should use Encoding.default_internal" do

spec/spec_helper.rb

@@ -7,6 +7,14 @@
 DatabaseCredentials = YAML.load_file('spec/configuration.yml')
 
 RSpec.configure do |config|
+  config.before :each do
+    @client = Mysql2::Client.new DatabaseCredentials['root']
+  end
+
+  config.after :each do
+    @client.close
+  end
+
   config.before(:all) do
     client = Mysql2::Client.new DatabaseCredentials['root']
     client.query %[