diff options
author | Josh Cooper <josh@puppetlabs.com> | 2011-08-19 14:03:56 -0700 |
---|---|---|
committer | Josh Cooper <josh@puppetlabs.com> | 2011-08-19 14:03:56 -0700 |
commit | 384302af6dec8c51442f2f29a4c7c555379cd297 (patch) | |
tree | 27680b19648100058c752e5fa4136a88a73d7a4f /spec/unit/sslcertificates | |
parent | 71e190bf255f98e900f7ddd55db393d448df3274 (diff) | |
parent | 2091cbeade9d69a18689609f407f9d7f0304dc04 (diff) | |
download | puppet-384302af6dec8c51442f2f29a4c7c555379cd297.tar.gz puppet-384302af6dec8c51442f2f29a4c7c555379cd297.tar.xz puppet-384302af6dec8c51442f2f29a4c7c555379cd297.zip |
Merge branch 'backport-windows-work-to-2.7' into 2.7.x
* backport-windows-work-to-2.7: (60 commits)
maint: Fix build break due to recent merge from 2.7.x to master
Fix posix exec provider spec failures on Windows
(#5495) Remove dead Windows-specific code from posix exec provider
Stop trying to make config directories in Windows specs
(#8272) Add missing tests for Windows service provider methods.
(#8409) Add a default group provider for Windows
(#8408) Add a default user provider for Windows
(#8408/8409) Add a Windows ADSI helper module
(#8663) Exclude exec timeout test on Windows
(#8663) Exclude git rev-parse HEAD spec test on Windows
Check for the appropriate permissions in File type tests on Windows
Remove :fails_on_windows from file type tests that no longer fail on Windows
Disable file bucket diffing tests on Windows
Always put a slash between the checksum and path in filebucket URLs
Treat Windows absolute paths as absolute paths
Consolidate test logic determining if a registered file is in the temp directory
Clarify logic and error messages when initializing Puppet::FileBucket::File
Disable symlink related file tests on Windows
(#8644) Host provider on Windows
(#8660) Fix destdir option on Windows
...
Diffstat (limited to 'spec/unit/sslcertificates')
-rwxr-xr-x | spec/unit/sslcertificates/ca_spec.rb | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/spec/unit/sslcertificates/ca_spec.rb b/spec/unit/sslcertificates/ca_spec.rb index eea246ba1..7a687b825 100755 --- a/spec/unit/sslcertificates/ca_spec.rb +++ b/spec/unit/sslcertificates/ca_spec.rb @@ -5,27 +5,23 @@ require 'puppet' require 'puppet/sslcertificates' require 'puppet/sslcertificates/ca' -describe Puppet::SSLCertificates::CA do +describe Puppet::SSLCertificates::CA, :unless => Puppet.features.microsoft_windows? do + include PuppetSpec::Files + before :all do @hosts = %w{host.domain.com Other.Testing.Com} end before :each do Puppet::Util::SUIDManager.stubs(:asuser).yields - file = Tempfile.new("ca_testing") - @dir = file.path - file.delete + dir = tmpdir("ca_testing") - Puppet.settings[:confdir] = @dir - Puppet.settings[:vardir] = @dir + Puppet.settings[:confdir] = dir + Puppet.settings[:vardir] = dir @ca = Puppet::SSLCertificates::CA.new end - after :each do - system("rm -rf #{@dir}") - end - describe 'when cleaning' do it 'should remove associated files' do dirs = [:csrdir, :signeddir, :publickeydir, :privatekeydir, :certdir] |