summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@puppetlabs.com>2015-04-10 09:09:46 -0700
committerColleen Murphy <colleen@puppetlabs.com>2015-04-10 09:15:15 -0700
commit65116dafd507c5111044853861f9b10b02c91854 (patch)
tree0084d0bb0dc159f412d09f9301d3f57b66d00f07
parente43f0582960707f8a7ff9f087ca2b521c1797a91 (diff)
downloadpuppet-stdlib-65116dafd507c5111044853861f9b10b02c91854.tar.gz
puppet-stdlib-65116dafd507c5111044853861f9b10b02c91854.tar.bz2
Fix acceptance tests for #405
This fixes the acceptance tests by: - Ensuring the fqdn_rand_string spec is passed undef as the second parameter so that the seed is not used as the charset - Ensuring the pw_hash spec is passed the key specifying the type of hash, rather than the value that will be used to generate the password - Expecting puppet to report nil instead of empty string for undef passwords - Removing the fqdn_rand_base64 test because there is no such function
-rw-r--r--spec/acceptance/fqdn_rand_base64_spec.rb60
-rw-r--r--spec/acceptance/fqdn_rand_string_spec.rb2
-rw-r--r--spec/acceptance/pw_hash_spec.rb6
3 files changed, 4 insertions, 64 deletions
diff --git a/spec/acceptance/fqdn_rand_base64_spec.rb b/spec/acceptance/fqdn_rand_base64_spec.rb
deleted file mode 100644
index 1b4eb72..0000000
--- a/spec/acceptance/fqdn_rand_base64_spec.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'fqdn_rand_base64 function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
- describe 'success' do
- let(:facts_d) do
- if fact('is_pe', '--puppet') == "true"
- if fact('osfamily') =~ /windows/i
- if fact('kernelmajversion').to_f < 6.0
- 'c:/documents and settings/all users/application data/puppetlabs/facter/facts.d'
- else
- 'c:/programdata/puppetlabs/facter/facts.d'
- end
- else
- '/etc/puppetlabs/facter/facts.d'
- end
- else
- '/etc/facter/facts.d'
- end
- end
- after :each do
- shell("if [ -f '#{facts_d}/fqdn.txt' ] ; then rm '#{facts_d}/fqdn.txt' ; fi")
- end
- before :each do
- #no need to create on windows, pe creates by default
- if fact('osfamily') !~ /windows/i
- shell("mkdir -p '#{facts_d}'")
- end
- end
- it 'generates random base64 strings' do
- shell("echo fqdn=fakehost.localdomain > '#{facts_d}/fqdn.txt'")
- pp = <<-eos
- $l = 10
- $o = fqdn_rand_base64($l)
- notice(inline_template('fqdn_rand_base64 is <%= @o.inspect %>'))
- eos
-
- apply_manifest(pp, :catch_failures => true) do |r|
- expect(r.stdout).to match(/fqdn_rand_base64 is "8ySYp0dq0B"/)
- end
- end
- it 'generates random base64 strings with custom seeds' do
- shell("echo fqdn=fakehost.localdomain > '#{facts_d}/fqdn.txt'")
- pp = <<-eos
- $l = 10
- $s = 'seed'
- $o = fqdn_rand_base64($l, $s)
- notice(inline_template('fqdn_rand_base64 is <%= @o.inspect %>'))
- eos
-
- apply_manifest(pp, :catch_failures => true) do |r|
- expect(r.stdout).to match(/fqdn_rand_base64 is "6J2c4oMRUJ"/)
- end
- end
- end
- describe 'failure' do
- it 'handles improper argument counts'
- it 'handles non-numbers for length argument'
- end
-end
diff --git a/spec/acceptance/fqdn_rand_string_spec.rb b/spec/acceptance/fqdn_rand_string_spec.rb
index a934fbb..8fe1a69 100644
--- a/spec/acceptance/fqdn_rand_string_spec.rb
+++ b/spec/acceptance/fqdn_rand_string_spec.rb
@@ -44,7 +44,7 @@ describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?(
pp = <<-eos
$l = 10
$s = 'seed'
- $o = fqdn_rand_string($l, $s)
+ $o = fqdn_rand_string($l, undef, $s)
notice(inline_template('fqdn_rand_string is <%= @o.inspect %>'))
eos
diff --git a/spec/acceptance/pw_hash_spec.rb b/spec/acceptance/pw_hash_spec.rb
index 4768975..eddb782 100644
--- a/spec/acceptance/pw_hash_spec.rb
+++ b/spec/acceptance/pw_hash_spec.rb
@@ -6,7 +6,7 @@ describe 'pw_hash function', :unless => (UNSUPPORTED_PLATFORMS + ['windows', 'Da
describe 'success' do
it 'hashes passwords' do
pp = <<-EOS
- $o = pw_hash('password', 6, 'salt')
+ $o = pw_hash('password', 'sha-512', 'salt')
notice(inline_template('pw_hash is <%= @o.inspect %>'))
EOS
@@ -17,12 +17,12 @@ describe 'pw_hash function', :unless => (UNSUPPORTED_PLATFORMS + ['windows', 'Da
it 'returns nil if no password is provided' do
pp = <<-EOS
- $o = pw_hash('', 6, 'salt')
+ $o = pw_hash('', 'sha-512', 'salt')
notice(inline_template('pw_hash is <%= @o.inspect %>'))
EOS
apply_manifest(pp, :catch_failures => true) do |r|
- expect(r.stdout).to match(/pw_hash is ""/)
+ expect(r.stdout).to match(/pw_hash is nil/)
end
end
end