Don't remove /tmp/concat in after :each

If the spec files are run in a random order, removing /tmp/concat after
certain tests could cause the next tests to fail if they do not recreate
this directory.

(cherry picked from commit 1edafdcf42)
This commit is contained in:
Hunter Haugen 2014-02-14 11:15:53 -08:00
parent dfb06479df
commit 35c0d2354f
2 changed files with 3 additions and 21 deletions

View file

@ -3,12 +3,10 @@ require 'spec_helper_acceptance'
describe 'concat backup parameter' do
context '=> puppet' do
before :all do
shell('rm -rf /tmp/concat')
shell('mkdir -p /tmp/concat')
shell("/bin/echo 'old contents' > /tmp/concat/file")
end
after :all do
shell('rm -rf /tmp/concat')
end
pp = <<-EOS
concat { '/tmp/concat/file':
@ -36,12 +34,10 @@ describe 'concat backup parameter' do
context '=> .backup' do
before :all do
shell('rm -rf /tmp/concat')
shell('mkdir -p /tmp/concat')
shell("/bin/echo 'old contents' > /tmp/concat/file")
end
after :all do
shell('rm -rf /tmp/concat')
end
pp = <<-EOS
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
context "=> 'false'" do
before :all do
shell('rm -rf /tmp/concat')
shell('mkdir -p /tmp/concat')
shell("/bin/echo 'old contents' > /tmp/concat/file")
end
after :all do
shell('rm -rf /tmp/concat')
end
pp = <<-EOS
concat { '/tmp/concat/file':

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