Cleanup acceptance tests

voxpupuli · Aug 28, 2023 · c9a8333 · c9a8333
1 parent 74bfe83
commit c9a8333
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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