tiny_tds 2.1.2 → 2.1.7

data/tasks/ports/recipe.rb

@@ -5,17 +5,30 @@ require 'rbconfig'
 
 module Ports
   class Recipe < MiniPortile
+    attr_writer :gem_platform
+
     def cook
-      checkpoint = "ports/#{name}-#{version}-#{host}.installed"
+      checkpoint = "ports/checkpoints/#{name}-#{version}-#{gem_platform}.installed"
 
       unless File.exist? checkpoint
         super
+        FileUtils.mkdir_p("ports/checkpoints")
         FileUtils.touch checkpoint
       end
     end
 
     private
 
+    attr_reader :gem_platform
+
+    def port_path
+      "#{@target}/#{gem_platform}/#{@name}/#{@version}"
+    end
+
+    def tmp_path
+      "tmp/#{gem_platform}/ports/#{@name}/#{@version}"
+    end
+
     def configure_defaults
       [
         "--host=#{@host}",
@@ -38,9 +51,9 @@ module Ports
 
     def get_patches(libname, version)
       patches = []
-  
+
       patch_path = File.expand_path(
-        File.join('..','..','..','patches',libname,version), 
+        File.join('..','..','..','patches',libname,version),
         __FILE__
       )
 
@@ -49,4 +62,3 @@ module Ports
     end
   end
 end
-

data/tasks/ports.rake

@@ -6,64 +6,70 @@ require_relative 'ports/openssl'
 require_relative 'ports/freetds'
 require_relative '../ext/tiny_tds/extconsts'
 
-OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if defined? OpenSSL
-
 namespace :ports do
-  openssl = Ports::Openssl.new(OPENSSL_VERSION)
-  libiconv = Ports::Libiconv.new(ICONV_VERSION)
-  freetds = Ports::Freetds.new(FREETDS_VERSION)
+  libraries_to_compile = {
+    openssl: Ports::Openssl.new(OPENSSL_VERSION),
+    libiconv: Ports::Libiconv.new(ICONV_VERSION),
+    freetds: Ports::Freetds.new(FREETDS_VERSION)
+  }
 
   directory "ports"
+  CLEAN.include "ports/*mingw*"
+  CLEAN.include "ports/*.installed"
+
+  task :openssl, [:host, :gem_platform] do |_task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
 
-  task :openssl, [:host] do |task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'])
+    libraries_to_compile[:openssl].files = [OPENSSL_SOURCE_URI]
+    libraries_to_compile[:openssl].host = args.host
+    libraries_to_compile[:openssl].gem_platform = args.gem_platform
 
-    openssl.files = [OPENSSL_SOURCE_URI]
-    openssl.host = args.host
-    openssl.cook
-    openssl.activate
+    libraries_to_compile[:openssl].cook
+    libraries_to_compile[:openssl].activate
   end
 
-  task :libiconv, [:host] do |task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'])
+  task :libiconv, [:host, :gem_platform] do |_task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
 
-    libiconv.files = [ICONV_SOURCE_URI]
-    libiconv.host = args.host
-    libiconv.cook
-    libiconv.activate
+    libraries_to_compile[:libiconv].files = [ICONV_SOURCE_URI]
+    libraries_to_compile[:libiconv].host = args.host
+    libraries_to_compile[:libiconv].gem_platform = args.gem_platform
+    libraries_to_compile[:libiconv].cook
+    libraries_to_compile[:libiconv].activate
   end
 
-  task :freetds, [:host] do |task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'])
+  task :freetds, [:host, :gem_platform] do |_task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
 
-    freetds.files = [FREETDS_SOURCE_URI]
-    freetds.host = args.host
+    libraries_to_compile[:freetds].files = [FREETDS_SOURCE_URI]
+    libraries_to_compile[:freetds].host = args.host
+    libraries_to_compile[:freetds].gem_platform = args.gem_platform
 
-    if openssl
+    if libraries_to_compile[:openssl]
       # freetds doesn't have an option that will provide an rpath
       # so we do it manually
-      ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{openssl.path}/lib"
+      ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{libraries_to_compile[:openssl].path}/lib"
       # Add the pkgconfig file with MSYS2'ish path, to prefer our ports build
       # over MSYS2 system OpenSSL.
-      ENV['PKG_CONFIG_PATH'] = "#{openssl.path.gsub(/^(\w):/i){"/"+$1.downcase}}/lib/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
-      freetds.configure_options << "--with-openssl=#{openssl.path}"
+      ENV['PKG_CONFIG_PATH'] = "#{libraries_to_compile[:openssl].path.gsub(/^(\w):/i) { "/" + $1.downcase }}/lib/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
+      libraries_to_compile[:freetds].configure_options << "--with-openssl=#{libraries_to_compile[:openssl].path}"
     end
 
-    if libiconv
-      freetds.configure_options << "--with-libiconv-prefix=#{libiconv.path}"
+    if libraries_to_compile[:libiconv]
+      libraries_to_compile[:freetds].configure_options << "--with-libiconv-prefix=#{libraries_to_compile[:libiconv].path}"
     end
 
-    freetds.cook
-    freetds.activate
+    libraries_to_compile[:freetds].cook
+    libraries_to_compile[:freetds].activate
   end
 
-  task :compile, [:host] do |task,args|
-    args.with_defaults(host: RbConfig::CONFIG['host'])
+  task :compile, [:host, :gem_platform] do |_task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
 
-    puts "Compiling ports for #{args.host}..."
+    puts "Compiling ports for #{args.host} (Ruby platform #{args.gem_platform}) ..."
 
-    ['openssl','libiconv','freetds'].each do |lib|
-      Rake::Task["ports:#{lib}"].invoke(args.host)
+    libraries_to_compile.keys.each do |lib|
+      Rake::Task["ports:#{lib}"].invoke(args.host, args.gem_platform)
     end
   end
 
@@ -71,15 +77,30 @@ namespace :ports do
   task 'cross' do
     require 'rake_compiler_dock'
 
-    # make sure to install our bundle
-    build = ['bundle']
-
     # build the ports for all our cross compile hosts
-    GEM_PLATFORM_HOSTS.each do |gem_platform, host|
-      build << "rake ports:compile[#{host}] MAKE='make -j`nproc`'"
+    GEM_PLATFORM_HOSTS.each do |gem_platform, meta|
+      # make sure to install our bundle
+      build = ['bundle']
+      build << "RUBY_CC_VERSION=#{meta[:ruby_versions]} rake ports:compile[#{meta[:host]},#{gem_platform}] MAKE='make -j`nproc`'"
+      RakeCompilerDock.sh build.join(' && '), platform: gem_platform
+    end
+  end
+
+  desc "Notes the actual versions for the compiled ports into a file"
+  task "version_file", [:gem_platform] do |_task, args|
+    args.with_defaults(gem_platform: RbConfig::CONFIG["arch"])
+
+    ports_version = {}
+
+    libraries_to_compile.each do |library, library_recipe|
+      ports_version[library] = library_recipe.version
     end
 
-    RakeCompilerDock.sh build.join(' && ')
+    ports_version[:platform] = args.gem_platform
+
+    File.open(".ports_versions", "w") do |f|
+      f.write ports_version
+    end
   end
 end
 

data/test/bin/install-mssql.ps1

@@ -0,0 +1,31 @@
+$ProgressPreference = 'SilentlyContinue'
+
+if (-not(Test-path "C:\Downloads"))
+{
+    mkdir "C:\Downloads"
+}
+
+$sqlInstallationFile = "C:\Downloads\sqlexpress.exe"
+if (-not(Test-path $sqlInstallationFile -PathType leaf))
+{
+    Write-Host "Downloading SQL Express ..."
+    Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/?linkid=829176" -OutFile "C:\Downloads\sqlexpress.exe"
+}
+
+Write-Host "Installing SQL Express ..."
+Start-Process -Wait -FilePath "C:\Downloads\sqlexpress.exe" -ArgumentList /qs, /x:"C:\Downloads\setup"
+C:\Downloads\setup\setup.exe /q /ACTION=Install /INSTANCENAME=SQLEXPRESS /FEATURES=SQLEngine /UPDATEENABLED=0 /SQLSVCACCOUNT='NT AUTHORITY\System' /SQLSYSADMINACCOUNTS='BUILTIN\ADMINISTRATORS' /TCPENABLED=1 /NPENABLED=0 /IACCEPTSQLSERVERLICENSETERMS
+
+Write-Host "Configuring SQL Express ..."
+stop-service MSSQL`$SQLEXPRESS
+set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpdynamicports -value ''
+set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpport -value 1433
+set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\' -name LoginMode -value 2
+
+Write-Host "Starting SQL Express ..."
+start-service MSSQL`$SQLEXPRESS
+
+Write-Host "Configuring MSSQL for TinyTDS ..."
+& sqlcmd -Q "CREATE DATABASE [tinytdstest];"
+& sqlcmd -Q "CREATE LOGIN [tinytds] WITH PASSWORD = '', CHECK_POLICY = OFF, DEFAULT_DATABASE = [tinytdstest];"
+& sqlcmd -Q "USE [tinytdstest]; CREATE USER [tinytds] FOR LOGIN [tinytds]; EXEC sp_addrolemember N'db_owner', N'tinytds';"

data/test/bin/install-mssqltools.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
+curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
+sudo apt-get update
+sudo ACCEPT_EULA=Y apt-get -y install mssql-tools unixodbc-dev

data/test/bin/setup_tinytds_db.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -i ./test/sql/db-create.sql
+/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -i ./test/sql/db-login.sql

data/test/bin/setup_volume_permissions.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -x
+
+sudo groupadd -g 3434 circleci_tinytds
+sudo usermod -a -G circleci_tinytds $USER
+sudo useradd circleci_tinytds -u 3434 -g 3434
+sudo usermod -a -G circleci_tinytds circleci_tinytds
+sudo chgrp -R circleci_tinytds .
+sudo chmod -R g+rwx .

data/test/client_test.rb

@@ -2,9 +2,7 @@
 require 'test_helper'
 
 class ClientTest < TinyTds::TestCase
-
-  describe 'With valid credentials' do
-
+  describe 'with valid credentials' do
     before do
       @client = new_connection
     end
@@ -18,6 +16,7 @@ class ClientTest < TinyTds::TestCase
       assert @client.close
       assert @client.closed?
       assert !@client.active?
+      assert @client.dead?
       action = lambda { @client.execute('SELECT 1 as [one]').each }
       assert_raise_tinytds_error(action) do |e|
         assert_match %r{closed connection}i, e.message, 'ignore if non-english test run'
@@ -67,10 +66,12 @@ class ClientTest < TinyTds::TestCase
         client.close if client
       end
     end unless sqlserver_azure?
-
   end
 
   describe 'With in-valid options' do
+    before(:all) do
+      init_toxiproxy
+    end
 
     it 'raises an argument error when no :host given and :dataserver is blank' do
       assert_raises(ArgumentError) { new_connection :dataserver => nil, :host => nil }
@@ -132,30 +133,63 @@ class ClientTest < TinyTds::TestCase
       end
     end
 
-    it 'must run this test to prove we account for dropped connections' do
-      skip
+    it 'raises TinyTds exception with tcp socket network failure' do
       begin
-        client = new_connection :login_timeout => 2, :timeout => 2
+        client = new_connection timeout: 2, port: 1234, host: ENV['TOXIPROXY_HOST']
         assert_client_works(client)
-        STDOUT.puts "Disconnect network!"
-        sleep 10
-        STDOUT.puts "This should not get stuck past 6 seconds!"
-        action = lambda { client.execute('SELECT 1 as [one]').each }
+        action = lambda { client.execute("waitfor delay '00:00:05'").do }
+
+        # Use toxiproxy to close the TCP socket after 1 second.
+        # We want TinyTds to execute the statement, hit the timeout configured above, and then not be able to use the network to cancel
+        # the network connection needs to close after the sql batch is sent and before the timeout above is hit
+        Toxiproxy[:sqlserver_test].toxic(:slow_close, delay: 1000).apply do
+          assert_raise_tinytds_error(action) do |e|
+            assert_equal 20003, e.db_error_number
+            assert_equal 6, e.severity
+            assert_match %r{timed out}i, e.message, 'ignore if non-english test run'
+          end
+        end
+      ensure
+        assert_new_connections_work
+      end
+    end
+
+    it 'raises TinyTds exception with dead connection network failure' do
+      skip if ruby_windows?
+
+      begin
+        client = new_connection timeout: 2, port: 1234, host: ENV['TOXIPROXY_HOST']
+        assert_client_works(client)
+        action = lambda { client.execute("waitfor delay '00:00:05'").do }
+
+        # Use toxiproxy to close the network connection after 1 second.
+        # We want TinyTds to execute the statement, hit the timeout configured above, and then not be able to use the network to cancel
+        # the network connection needs to close after the sql batch is sent and before the timeout above is hit
+        Toxiproxy[:sqlserver_test].toxic(:timeout, timeout: 1000).apply do
+          assert_raise_tinytds_error(action) do |e|
+            assert_equal 20047, e.db_error_number
+            assert_includes [1,9], e.severity
+            assert_match %r{dead or not enabled}i, e.message, 'ignore if non-english test run'
+          end
+        end
+      ensure
+        assert_new_connections_work
+      end
+    end
+
+    it 'raises TinyTds exception with login timeout' do
+      begin
+        action = lambda do
+          Toxiproxy[:sqlserver_test].toxic(:timeout, timeout: 0).apply do
+            new_connection login_timeout: 1, port: 1234, host: ENV['TOXIPROXY_HOST']
+          end
+        end
         assert_raise_tinytds_error(action) do |e|
           assert_equal 20003, e.db_error_number
           assert_equal 6, e.severity
           assert_match %r{timed out}i, e.message, 'ignore if non-english test run'
         end
       ensure
-        STDOUT.puts "Reconnect network!"
-        sleep 10
-        action = lambda { client.execute('SELECT 1 as [one]').each }
-        assert_raise_tinytds_error(action) do |e|
-          assert_equal 20047, e.db_error_number
-          assert_equal 1, e.severity
-          assert_match %r{dead or not enabled}i, e.message, 'ignore if non-english test run'
-        end
-        close_client(client)
         assert_new_connections_work
       end
     end
@@ -174,57 +208,68 @@ class ClientTest < TinyTds::TestCase
 
   end
 
-  describe 'Private methods' do
-
+  describe '#parse_username' do
     let(:client) { @client = new_connection }
 
-    it '#parse_username returns username if azure is not true' do
-      username = 'user@abc123.database.windows.net'
-      client.send(:parse_username, username: username).must_equal username
+    it 'returns username if azure is not true' do
+      _(
+        client.send(:parse_username, username: 'user@abc123.database.windows.net')
+      ).must_equal 'user@abc123.database.windows.net'
     end
 
-    it '#parse_username returns short username if azure is true' do
-      client.send(:parse_username,
-        username: 'user@abc123.database.windows.net',
-        host: 'abc123.database.windows.net',
-        azure: true
+    it 'returns short username if azure is true' do
+      _(
+        client.send(
+          :parse_username,
+          username: 'user@abc123.database.windows.net',
+          host:     'abc123.database.windows.net',
+          azure:    true
+        )
       ).must_equal 'user@abc123'
     end
 
-    it '#parse_username returns full username if azure is false' do
-      client.send(:parse_username,
-        username: 'user@abc123.database.windows.net',
-        host: 'abc123.database.windows.net',
-        azure: false
+    it 'returns full username if azure is false' do
+      _(
+        client.send(
+          :parse_username,
+          username: 'user@abc123.database.windows.net',
+          host:     'abc123.database.windows.net',
+          azure:    false
+        )
       ).must_equal 'user@abc123.database.windows.net'
     end
 
-    it '#parse_username returns short username if passed and azure is true' do
-      client.send(:parse_username,
-        username: 'user@abc123',
-        host: 'abc123.database.windows.net',
-        azure: true
+    it 'returns short username if passed and azure is true' do
+      _(
+        client.send(
+          :parse_username,
+          username: 'user@abc123',
+          host:     'abc123.database.windows.net',
+          azure:    true
+        )
       ).must_equal 'user@abc123'
     end
 
-    it '#parse_username returns username with servername if passed and azure is true' do
-      client.send(:parse_username,
-        username: 'user',
-        host: 'abc123.database.windows.net',
-        azure: true
+    it 'returns username with servername if passed and azure is true' do
+      _(
+        client.send(
+          :parse_username,
+          username: 'user',
+          host:     'abc123.database.windows.net',
+          azure:    true
+        )
       ).must_equal 'user@abc123'
     end
 
-    it '#parse_username returns username with servername if passed and azure is false' do
-      client.send(:parse_username,
-        username: 'user',
-        host: 'abc123.database.windows.net',
-        azure: false
+    it 'returns username with servername if passed and azure is false' do
+      _(
+        client.send(
+          :parse_username,
+          username: 'user',
+          host:     'abc123.database.windows.net',
+          azure:    false
+        )
       ).must_equal 'user'
     end
-
   end
-
-
 end
-

data/test/gem_test.rb

@@ -9,11 +9,11 @@ class GemTest < MiniTest::Spec
 
     # We're going to muck with some system globals so lets make sure
     # they get set back later
-    original_host = RbConfig::CONFIG['host']
+    original_platform = RbConfig::CONFIG['arch']
     original_pwd = Dir.pwd
 
     after do
-      RbConfig::CONFIG['host'] = original_host
+      RbConfig::CONFIG['arch'] = original_platform
       Dir.chdir original_pwd
     end
 
@@ -21,13 +21,13 @@ class GemTest < MiniTest::Spec
       let(:root_path) { TinyTds::Gem.root_path }
 
       it 'should be the root path' do
-        root_path.must_equal gem_root
+        _(root_path).must_equal gem_root
       end
 
       it 'should be the root path no matter the cwd' do
         Dir.chdir '/'
 
-        root_path.must_equal gem_root
+        _(root_path).must_equal gem_root
       end
     end
 
@@ -35,19 +35,19 @@ class GemTest < MiniTest::Spec
       let(:ports_root_path) { TinyTds::Gem.ports_root_path }
 
       it 'should be the ports path' do
-        ports_root_path.must_equal File.join(gem_root,'ports')
+        _(ports_root_path).must_equal File.join(gem_root,'ports')
       end
 
       it 'should be the ports path no matter the cwd' do
         Dir.chdir '/'
 
-        ports_root_path.must_equal File.join(gem_root,'ports')
+        _(ports_root_path).must_equal File.join(gem_root,'ports')
       end
     end
 
     describe '#ports_bin_paths' do
       let(:ports_bin_paths) { TinyTds::Gem.ports_bin_paths }
-        
+
       describe 'when the ports directories exist' do
         let(:fake_bin_paths) do
           ports_host_root = File.join(gem_root, 'ports', 'fake-host-with-dirs')
@@ -61,7 +61,7 @@ class GemTest < MiniTest::Spec
         end
 
         before do
-          RbConfig::CONFIG['host'] = 'fake-host-with-dirs'
+          RbConfig::CONFIG['arch'] = 'fake-host-with-dirs'
           fake_bin_paths.each do |path|
             FileUtils.mkdir_p(path)
           end
@@ -74,34 +74,34 @@ class GemTest < MiniTest::Spec
         end
 
         it 'should return all the bin directories' do
-          ports_bin_paths.sort.must_equal fake_bin_paths.sort
+          _(ports_bin_paths.sort).must_equal fake_bin_paths.sort
         end
 
         it 'should return all the bin directories regardless of cwd' do
           Dir.chdir '/'
-          ports_bin_paths.sort.must_equal fake_bin_paths.sort
+          _(ports_bin_paths.sort).must_equal fake_bin_paths.sort
         end
       end
 
       describe 'when the ports directories are missing' do
         before do
-          RbConfig::CONFIG['host'] = 'fake-host-without-dirs'
+          RbConfig::CONFIG['arch'] = 'fake-host-without-dirs'
         end
 
         it 'should return no directories' do
-          ports_bin_paths.must_be_empty
+          _(ports_bin_paths).must_be_empty
         end
 
         it 'should return no directories regardless of cwd' do
           Dir.chdir '/'
-          ports_bin_paths.must_be_empty
+          _(ports_bin_paths).must_be_empty
         end
       end
     end
 
     describe '#ports_lib_paths' do
       let(:ports_lib_paths) { TinyTds::Gem.ports_lib_paths }
-        
+
       describe 'when the ports directories exist' do
         let(:fake_lib_paths) do
           ports_host_root = File.join(gem_root, 'ports', 'fake-host-with-dirs')
@@ -115,7 +115,7 @@ class GemTest < MiniTest::Spec
         end
 
         before do
-          RbConfig::CONFIG['host'] = 'fake-host-with-dirs'
+          RbConfig::CONFIG['arch'] = 'fake-host-with-dirs'
           fake_lib_paths.each do |path|
             FileUtils.mkdir_p(path)
           end
@@ -128,48 +128,46 @@ class GemTest < MiniTest::Spec
         end
 
         it 'should return all the lib directories' do
-          ports_lib_paths.sort.must_equal fake_lib_paths.sort
+          _(ports_lib_paths.sort).must_equal fake_lib_paths.sort
         end
 
         it 'should return all the lib directories regardless of cwd' do
           Dir.chdir '/'
-          ports_lib_paths.sort.must_equal fake_lib_paths.sort
+          _(ports_lib_paths.sort).must_equal fake_lib_paths.sort
         end
       end
 
       describe 'when the ports directories are missing' do
         before do
-          RbConfig::CONFIG['host'] = 'fake-host-without-dirs'
+          RbConfig::CONFIG['arch'] = 'fake-host-without-dirs'
         end
 
 
         it 'should return no directories' do
-          ports_lib_paths.must_be_empty
+          _(ports_lib_paths).must_be_empty
         end
 
         it 'should return no directories regardless of cwd' do
           Dir.chdir '/'
-          ports_lib_paths.must_be_empty
+          _(ports_lib_paths).must_be_empty
         end
       end
     end
 
     describe '#ports_host' do
       {
-        'i686-pc-linux-gnu' => 'i686-pc-linux-gnu',
-        'x86_64-pc-linux-gnu' => 'x86_64-pc-linux-gnu',
-        'i686-w64-mingw32' => 'i686-w64-mingw32',
-        'x86_64-w64-mingw32' => 'x86_64-w64-mingw32',
-        # consolidate this host to our build w64-mingw32 arch
-        'i686-pc-mingw32' => 'i686-w64-mingw32'
+        'x64-mingw-ucrt' => 'x64-mingw-ucrt',
+        'x64-mingw32' => 'x64-mingw32',
+        'x86-mingw32' => 'x86-mingw32',
+        'x86_64-linux' => 'x86_64-linux',
       }.each do |host,expected|
         describe "on a #{host} architecture" do
           before do
-            RbConfig::CONFIG['host'] = host
+            RbConfig::CONFIG['arch'] = host
           end
 
           it "should return a #{expected} ports host" do
-            TinyTds::Gem.ports_host.must_equal expected
+            _(TinyTds::Gem.ports_host).must_equal expected
           end
         end
       end