Merge branch 'master' of github.com:diaspora/diaspora

2011-02-12 21:08:06 +01:00 · 2011-02-12 21:08:06 +01:00 · e76c5068d1
commit e76c5068d1
parent 6f4ffee1e4 84d596ee47
1 changed files with 4 additions and 0 deletions
--- a/lib/tasks/cruise.rake
+++ b/lib/tasks/cruise.rake
@ -8,7 +8,11 @@ namespace :cruise do
    exit_status = $?.exitstatus
    puts "Stopping virtual display..."
    `sh -e /etc/init.d/xvfb stop`
+    puts "Cleaning up..."
+    FileUtils.rm_rf("#{Rails.root}/public/uploads/images")
+    FileUtils.rm_rf("#{Rails.root}/public/uploads/tmp")
    raise "tests failed!" unless exit_status == 0
+    puts "All tests passed!"
  end

  task :migrate do