summaryrefslogtreecommitdiffstats
path: root/acceptance
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-06-09 15:43:22 -0700
committerNick Lewis <nick@puppetlabs.com>2011-06-09 15:48:27 -0700
commitecde13449aab95cba22103075a362cfeb91b4ec0 (patch)
tree2272ef1ff2be1aaeec9ce6d10d1e011ffceced4c /acceptance
parentb502423356f0cf9c42f06fe5822c8840069620ab (diff)
downloadpuppet-ecde13449aab95cba22103075a362cfeb91b4ec0.tar.gz
puppet-ecde13449aab95cba22103075a362cfeb91b4ec0.tar.xz
puppet-ecde13449aab95cba22103075a362cfeb91b4ec0.zip
(#3360) Delete SSL directory in acceptance test before running
A leftover SSL directory from another test, including a cert for the agent, will cause this test to fail. So before running, we remove the SSL directory to ensure this doesn't happen. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com> Reviewed-By: Dominic Maraglia <dominic@puppetlabs.com>
Diffstat (limited to 'acceptance')
-rw-r--r--acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb b/acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb
index 4d650b2e9..9eaf4c224 100644
--- a/acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb
+++ b/acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb
@@ -2,6 +2,8 @@ test_name "#3360: Allow duplicate CSR when allow_duplicate_certs is on"
agent_hostnames = agents.map {|a| a.to_s}
+step "Remove existing SSL directory for agents"
+on agents, "rm -r #{config['puppetpath']}/ssl"
with_master_running_on master, "--allow_duplicate_certs --certdnsnames=\"puppet:$(hostname -s):$(hostname -f)\" --verbose --noop" do
step "Generate a certificate request for the agent"