Update kitchen tests to match refactoring

Signed-off-by: Ben Hughes <[email protected]>

Author: bmhughes

test/cookbooks/test/recipes/all-tables.rb

@@ -4,7 +4,12 @@
 include_recipe '::centos-6-helper' if platform?('centos') && node['platform_version'].to_i == 6
 
 iptables_packages 'install iptables'
-iptables_service 'configure iptables services'
+iptables_service 'configure iptables services' do
+  action %i(enable start)
+
+  subscribes :restart, 'template[/etc/sysconfig/iptables]', :delayed
+  subscribes :restart, 'template[/etc/iptables/rules.v4]', :delayed
+end
 
 iptables_chain 'filter' do
   table :filter

test/cookbooks/test/recipes/install-and-remove.rb

@@ -4,7 +4,7 @@
 iptables_service 'configure iptables services'
 
 iptables_service 'remove-services' do
-  action :disable
+  action %i(stop disable)
 end
 
 iptables_packages 'remove-packages' do

test/cookbooks/test/recipes/rule-line-number.rb

@@ -4,7 +4,12 @@
 include_recipe '::centos-6-helper' if platform?('centos') && node['platform_version'].to_i == 6
 
 iptables_packages 'install iptables'
-iptables_service 'configure iptables services'
+iptables_service 'configure iptables services' do
+  action %i(enable start)
+
+  subscribes :restart, 'template[/etc/sysconfig/iptables]', :delayed
+  subscribes :restart, 'template[/etc/iptables/rules.v4]', :delayed
+end
 
 iptables_chain 'filter' do
   table :filter

test/cookbooks/test/recipes/rule-line.rb

@@ -3,7 +3,12 @@
 include_recipe '::centos-6-helper' if platform?('centos') && node['platform_version'].to_i == 6
 
 iptables_packages 'install iptables'
-iptables_service 'configure iptables services'
+iptables_service 'configure iptables services' do
+  action %i(enable start)
+
+  subscribes :restart, 'template[/etc/sysconfig/iptables]', :delayed
+  subscribes :restart, 'template[/etc/iptables/rules.v4]', :delayed
+end
 
 iptables_chain 'filter' do
   table :filter

test/cookbooks/test/recipes/rules.rb

@@ -4,7 +4,12 @@
 include_recipe '::centos-6-helper' if platform?('centos') && node['platform_version'].to_i == 6
 
 iptables_packages 'install iptables'
-iptables_service 'configure iptables services'
+iptables_service 'configure iptables services' do
+  action %i(enable start)
+
+  subscribes :restart, 'template[/etc/sysconfig/iptables]', :delayed
+  subscribes :restart, 'template[/etc/iptables/rules.v4]', :delayed
+end
 
 iptables_chain 'mangle' do
   table :mangle