[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5
Daniel Pittman
daniel at puppetlabs.com
Tue May 10 08:11:08 UTC 2011
The following commit has been merged in the experimental branch:
commit a1a09b086dc19ad5257599f24ef8d92bfcabc11e
Author: Daniel Pittman <daniel at puppetlabs.com>
Date: Wed Apr 6 14:37:07 2011 -0700
maint: whitespace cleanup for spec_helper.
We had some incorrect indentation in the file; we fix that up now before we
make any substantive changes.
Paired-With: Dan Bode <dan at puppetlabs.com>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4073cb6..3b04636 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,31 +12,33 @@ Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
end
RSpec.configure do |config|
- config.mock_with :mocha
+ config.mock_with :mocha
- config.before :each do
- # Set the confdir and vardir to gibberish so that tests
- # have to be correctly mocked.
- Puppet[:confdir] = "/dev/null"
- Puppet[:vardir] = "/dev/null"
+ config.before :each do
+ # Set the confdir and vardir to gibberish so that tests
+ # have to be correctly mocked.
+ Puppet[:confdir] = "/dev/null"
+ Puppet[:vardir] = "/dev/null"
- # Avoid opening ports to the outside world
- Puppet.settings[:bindaddress] = "127.0.0.1"
+ # Avoid opening ports to the outside world
+ Puppet.settings[:bindaddress] = "127.0.0.1"
- @logs = []
- Puppet::Util::Log.newdestination(@logs)
- end
+ @logs = []
+ Puppet::Util::Log.newdestination(@logs)
- config.after :each do
- Puppet.settings.clear
+
+ end
- @logs.clear
- Puppet::Util::Log.close_all
- end
+ config.after :each do
+ Puppet.settings.clear
+
+ @logs.clear
+ Puppet::Util::Log.close_all
+ end
end
# We need this because the RAL uses 'should' as a method. This
# allows us the same behaviour but with a different method name.
class Object
- alias :must :should
+ alias :must :should
end
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list