From c9a83330cb27f20711da745e5270f2a237b63e1f Mon Sep 17 00:00:00 2001 From: Patrick Riehecky Date: Mon, 28 Aug 2023 09:44:46 -0500 Subject: [PATCH] Cleanup acceptance tests --- spec/acceptance/suites/default/00_default_spec.rb | 5 ++--- spec/spec_helper_acceptance.rb | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/spec/acceptance/suites/default/00_default_spec.rb b/spec/acceptance/suites/default/00_default_spec.rb index 39aff73e..82c3bbcf 100644 --- a/spec/acceptance/suites/default/00_default_spec.rb +++ b/spec/acceptance/suites/default/00_default_spec.rb @@ -20,10 +20,9 @@ class { 'firewalld': class ssh_test { firewalld_service{ 'test_sshd': zone => 'test' } - # TODO: Switch this when the defined type gets deprecated - firewalld::custom_service{ 'test_sshd': + firewalld_custom_service{ 'test_sshd': description => 'Test SSH Access', - port => [{ 'port' => '22', 'protocol' => 'tcp' }] + ports => [{ 'port' => '22', 'protocol' => 'tcp' }] } } diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 4235f3e1..72755799 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -13,11 +13,7 @@ unless ENV['BEAKER_provision'] == 'no' hosts.each do |host| # Install Puppet - if host.is_pe? - install_pe - else install_puppet - end end end