summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2010-09-03 15:35:01 -0700
committerJames Turnbull <james@lovedthanlost.net>2010-09-04 09:06:00 +1000
commite860907724ede52bf798d22d157ddc86f9c4646b (patch)
treea4538823816de6491105115cb295f708e353d7d8
parent419e007b3daa8c0a68011c36d03412d1b8d9f371 (diff)
downloadpuppet-e860907724ede52bf798d22d157ddc86f9c4646b.tar.gz
puppet-e860907724ede52bf798d22d157ddc86f9c4646b.tar.xz
puppet-e860907724ede52bf798d22d157ddc86f9c4646b.zip
[#4660] Avoid passing rake and autotest args to puppet tests
Autotest was failing on puppet apply tests because it was reading autotest's args as the manifest file and then erroring because it wasn't a valid file.
-rw-r--r--spec/spec_helper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ab7ff6caf..2fe0c36a3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,6 +7,9 @@ $LOAD_PATH.unshift("#{dir}/")
$LOAD_PATH.unshift("#{dir}/lib") # a spec-specific test lib dir
$LOAD_PATH.unshift("#{dir}/../lib")
+# Don't want puppet getting the command line arguments for rake or autotest
+ARGV.clear
+
require 'puppet'
require 'mocha'
gem 'rspec', '>=1.2.9'