Merge pull request #44 from hawknewton/idempotent_spec_clean

spec_clean does not fail if it has already been run
puppetlabs · Nov 13, 2013 · d596899 · d596899
2 parents 825993b + cec5846
commit d596899
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/lib/puppetlabs_spec_helper/rake_tasks.rb b/lib/puppetlabs_spec_helper/rake_tasks.rb
@@ -87,12 +87,9 @@ def fixtures(category)
   end
 
   fixtures("symlinks").each do |source, target|
-    FileUtils::rm(target)
-  end
-  site = "spec/fixtures/manifests/site.pp"
-  if File::exists?(site) and ! File.size?(site)
-    FileUtils::rm("spec/fixtures/manifests/site.pp")
+    FileUtils::rm_f(target)
   end
+  FileUtils::rm_f("spec/fixtures/manifests/site.pp")
 end
 
 desc "Run spec tests in a clean fixtures directory"