Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

More polite cleanup for sqlite tests #7192

Merged
merged 1 commit into from

3 participants

@bogdan

These tests are failing before file got created on my side.
ensure block should support early fail as well.

@carlosantoniodasilva carlosantoniodasilva merged commit f7b4016 into rails:master
@carlosantoniodasilva carlosantoniodasilva merged commit fd0004b into rails:master
@carlosantoniodasilva

Thanks.

@tenderlove
Owner

If we were using tmpdirs here, we wouldn't have to do this. :cry:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 29, 2012
  1. @bogdan
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 4 deletions.
  1. +4 −4 activerecord/test/cases/tasks/sqlite_rake_test.rb
View
8 activerecord/test/cases/tasks/sqlite_rake_test.rb
@@ -162,8 +162,8 @@ def test_structure_dump
assert File.exists?(dbfile)
assert File.exists?(filename)
ensure
- FileUtils.rm(filename)
- FileUtils.rm(dbfile)
+ FileUtils.rm_f(filename)
+ FileUtils.rm_f(dbfile)
end
end
@@ -184,8 +184,8 @@ def test_structure_load
ActiveRecord::Tasks::DatabaseTasks.structure_load @configuration, filename, '/rails/root'
assert File.exists?(dbfile)
ensure
- FileUtils.rm(filename)
- FileUtils.rm(dbfile)
+ FileUtils.rm_f(filename)
+ FileUtils.rm_f(dbfile)
end
end
end
Something went wrong with that request. Please try again.