aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-29 10:24:24 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-29 10:24:24 -0700
commitf7b40166b2e5ad8845c9b9c81681b450ddd672dc (patch)
tree176b3890bc793d872246c0adb83e44c8a9ab0dfd /activerecord
parent07ecaf5063c06558e0566f70cafdfdbe2b7ac2cb (diff)
parentfd0004b796655b7db3e80af90a8e9bb5978153ef (diff)
downloadrails-f7b40166b2e5ad8845c9b9c81681b450ddd672dc.tar.gz
rails-f7b40166b2e5ad8845c9b9c81681b450ddd672dc.tar.bz2
rails-f7b40166b2e5ad8845c9b9c81681b450ddd672dc.zip
Merge pull request #7192 from bogdan/sqlite_tests_fix
More polite cleanup for sqlite tests
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/tasks/sqlite_rake_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb
index 06a1d0ffc2..7209c0f14d 100644
--- a/activerecord/test/cases/tasks/sqlite_rake_test.rb
+++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb
@@ -162,8 +162,8 @@ module ActiveRecord
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 @@ module ActiveRecord
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