opuppet/module-concat
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #144 from hunner/fix_rm2

Browse source 
Don't remove /tmp/concat in after :each
This commit is contained in:
Hunter Haugen 2014-02-14 11:19:31 -08:00
commit 8c610a27d8
2 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
spec/acceptance/backup_spec.rb
View file

@ -3,12 +3,10 @@ require 'spec_helper_acceptance'
describe 'concat backup parameter' do describe 'concat backup parameter' do
context '=> puppet' do context '=> puppet' do
before :all do before :all do
shell('rm -rf /tmp/concat')
shell('mkdir -p /tmp/concat') shell('mkdir -p /tmp/concat')
shell("/bin/echo 'old contents' > /tmp/concat/file") shell("/bin/echo 'old contents' > /tmp/concat/file")
end end
after :all do
shell('rm -rf /tmp/concat')
end
pp = <<-EOS pp = <<-EOS
concat { '/tmp/concat/file': concat { '/tmp/concat/file':
@ -36,12 +34,10 @@ describe 'concat backup parameter' do
context '=> .backup' do context '=> .backup' do
before :all do before :all do
shell('rm -rf /tmp/concat')
shell('mkdir -p /tmp/concat') shell('mkdir -p /tmp/concat')
shell("/bin/echo 'old contents' > /tmp/concat/file") shell("/bin/echo 'old contents' > /tmp/concat/file")
end end
after :all do
shell('rm -rf /tmp/concat')
end
pp = <<-EOS pp = <<-EOS
concat { '/tmp/concat/file': concat { '/tmp/concat/file':
@ -74,12 +70,10 @@ describe 'concat backup parameter' do
# boolean false value, but the string 'false' has the same effect in Puppet 3 # boolean false value, but the string 'false' has the same effect in Puppet 3
context "=> 'false'" do context "=> 'false'" do
before :all do before :all do
shell('rm -rf /tmp/concat')
shell('mkdir -p /tmp/concat') shell('mkdir -p /tmp/concat')
shell("/bin/echo 'old contents' > /tmp/concat/file") shell("/bin/echo 'old contents' > /tmp/concat/file")
end end
after :all do
shell('rm -rf /tmp/concat')
end
pp = <<-EOS pp = <<-EOS
concat { '/tmp/concat/file': concat { '/tmp/concat/file':

12
spec/acceptance/basic_spec.rb
View file

@ -1,12 +0,0 @@
require 'spec_helper_acceptance'
# Here we put the more basic fundamental tests, ultra obvious stuff.
describe "basic tests:" do
it 'copies the module across' do
# No point diagnosing any more if the module wasn't copied properly
shell "ls #{default['distmoduledir']}/concat" do |r|
expect(r.stdout).to match(/Modulefile/)
expect(r.stderr).to be_empty
end
end
end