3 files changed, 22 insertions, 11 deletions
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_create_folder_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_create_folder_test.rb
index 887dcfc96c..9b675b804b 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_create_folder_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_create_folder_test.rb
@@ -6,13 +6,17 @@ module ActiveRecord
     class SQLite3CreateFolder < ActiveRecord::SQLite3TestCase
       def test_sqlite_creates_directory
         Dir.mktmpdir do |dir|
-          dir = Pathname.new(dir)
-          @conn = Base.sqlite3_connection :database => dir.join("db/foo.sqlite3"),
-                               :adapter => 'sqlite3',
-                               :timeout => 100
+          begin
+            dir = Pathname.new(dir)
+            @conn = Base.sqlite3_connection :database => dir.join("db/foo.sqlite3"),
+                                 :adapter => 'sqlite3',
+                                 :timeout => 100
 
-          assert Dir.exist? dir.join('db')
-          assert File.exist? dir.join('db/foo.sqlite3')
+            assert Dir.exist? dir.join('db')
+            assert File.exist? dir.join('db/foo.sqlite3')
+          ensure
+            @conn.disconnect! if @conn
+          end
         end
       end
     end
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index dc555caaff..d4d08049c8 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -211,7 +211,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_preserving_time_objects_with_local_time_conversion_to_default_timezone_utc
-    with_env_tz 'America/New_York' do
+    with_env_tz eastern_time_zone do
       with_timezone_config default: :utc do
         time = Time.local(2000)
         topic = Topic.create('written_on' => time)
@@ -224,7 +224,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_preserving_time_objects_with_time_with_zone_conversion_to_default_timezone_utc
-    with_env_tz 'America/New_York' do
+    with_env_tz eastern_time_zone do
       with_timezone_config default: :utc do
         Time.use_zone 'Central Time (US & Canada)' do
           time = Time.zone.local(2000)
@@ -239,7 +239,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_preserving_time_objects_with_utc_time_conversion_to_default_timezone_local
-    with_env_tz 'America/New_York' do
+    with_env_tz eastern_time_zone do
       with_timezone_config default: :local do
         time = Time.utc(2000)
         topic = Topic.create('written_on' => time)
@@ -252,7 +252,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_preserving_time_objects_with_time_with_zone_conversion_to_default_timezone_local
-    with_env_tz 'America/New_York' do
+    with_env_tz eastern_time_zone do
       with_timezone_config default: :local do
         Time.use_zone 'Central Time (US & Canada)' do
           time = Time.zone.local(2000)
@@ -266,6 +266,14 @@ class BasicsTest < ActiveRecord::TestCase
     end
   end
 
+  def eastern_time_zone
+    if Gem.win_platform?
+      "EST5EDT"
+    else
+      "America/New_York"
+    end
+  end
+
   def test_custom_mutator
     topic = Topic.find(1)
     # This mutator is protected in the class definition
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 19be357b6e..b6813891c6 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -549,7 +549,6 @@ class MigrationTest < ActiveRecord::TestCase
       expected_id = Zlib.crc32(current_database) * salt
 
       assert lock_id == expected_id, "expected lock id generated by the migrator to be #{expected_id}, but it was #{lock_id} instead"
-      assert lock_id.is_a?(Fixnum), "expected lock id to be a Fixnum, but it wasn't"
       assert lock_id.bit_length <= 63, "lock id must be a signed integer of max 63 bits magnitude"
     end