Merge remote-tracking branch 'jch/minitestify' into minitestify

Author: Jerry Cheung

.travis.yml

@@ -2,9 +2,11 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
   - jruby-19mode
   - rbx-19mode
+  # - rbx-2
 matrix:
   allow_failures:
     - rvm: jruby-19mode
-script: bundle exec rake spec
+script: bundle exec rake

Manifest.txt

@@ -29,7 +29,6 @@ lib/net/ldap/version.rb
 lib/net/snmp.rb
 net-ldap.gemspec
 spec/integration/ssl_ber_spec.rb
-spec/spec.opts
 spec/spec_helper.rb
 spec/unit/ber/ber_spec.rb
 spec/unit/ber/core_ext/array_spec.rb

lib/net/ldap/connection.rb

@@ -15,6 +15,8 @@ def initialize(server)
       raise Net::LDAP::LdapError, "No such address or other socket error."
     rescue Errno::ECONNREFUSED
       raise Net::LDAP::LdapError, "Server #{server[:host]} refused connection on port #{server[:port]}."
+    rescue Errno::EHOSTUNREACH => error
+      raise Net::LDAP::LdapError, "Host #{server[:host]} was unreachable (#{error.message})"
     end
 
     if server[:encryption]

test/test_ldap.rb

@@ -1,4 +1,4 @@
-require 'common'
+require 'test_helper'
 
 class TestLDAPInstrumentation < Test::Unit::TestCase
   def setup
@@ -7,7 +7,7 @@ def setup
 
     @service = MockInstrumentationService.new
     @subject = Net::LDAP.new \
-      :server => "test.mocked.com", :port => 636,
+      :host => "test.mocked.com", :port => 636,
       :force_no_page => true, # so server capabilities are not queried
       :instrumentation_service => @service
   end

test/test_ldap_connection.rb

@@ -3,22 +3,22 @@
 class TestLDAPConnection < Test::Unit::TestCase
   def test_unresponsive_host
     assert_raise Net::LDAP::LdapError do
-      Net::LDAP::Connection.new(:server => 'test.mocked.com', :port => 636)
+      Net::LDAP::Connection.new(:host => 'test.mocked.com', :port => 636)
     end
   end
 
   def test_blocked_port
     flexmock(TCPSocket).should_receive(:new).and_raise(SocketError)
     assert_raise Net::LDAP::LdapError do
-      Net::LDAP::Connection.new(:server => 'test.mocked.com', :port => 636)
+      Net::LDAP::Connection.new(:host => 'test.mocked.com', :port => 636)
     end
   end
 
   def test_raises_unknown_exceptions
     error = Class.new(StandardError)
     flexmock(TCPSocket).should_receive(:new).and_raise(error)
     assert_raise error do
-      Net::LDAP::Connection.new(:server => 'test.mocked.com', :port => 636)
+      Net::LDAP::Connection.new(:host => 'test.mocked.com', :port => 636)
     end
   end
 
@@ -50,7 +50,7 @@ def setup
     @tcp_socket = flexmock(:connection)
     @tcp_socket.should_receive(:write)
     flexmock(TCPSocket).should_receive(:new).and_return(@tcp_socket)
-    @connection = Net::LDAP::Connection.new(:server => 'test.mocked.com', :port => 636)
+    @connection = Net::LDAP::Connection.new(:host => 'test.mocked.com', :port => 636)
   end
 
   def test_error_failed_operation
@@ -74,15 +74,15 @@ def test_no_error_on_success
   end
 end
 
-class TestLDAPInstrumentation < Test::Unit::TestCase
+class TestLDAPConnectionInstrumentation < Test::Unit::TestCase
   def setup
     @tcp_socket = flexmock(:connection)
     @tcp_socket.should_receive(:write)
     flexmock(TCPSocket).should_receive(:new).and_return(@tcp_socket)
 
     @service = MockInstrumentationService.new
     @connection = Net::LDAP::Connection.new \
-      :server => 'test.mocked.com',
+      :host => 'test.mocked.com',
       :port => 636,
       :instrumentation_service => @service
   end