Merge pull request #3106 from jpartlow/maint/stable/ec2-centos6-acceptance-fixes

Maint/stable/ec2 centos6 acceptance fixes

2 files changed, 5 insertions, 18 deletions

diff --git a/acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb b/acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb
index 543c1d815..ea5bef339 100644
--- a/acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb
+++ b/acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb
@@ -45,8 +45,12 @@ teardown do
   # user and group ids back to the original uid and gid
   on master, 'rm -rf $(puppet master --configprint yamldir)'
 
+  if master.use_service_scripts?
+    on(master, puppet('resource', 'service', master['puppetservice'], 'ensure=stopped'))
+  end
+
   hosts.each do |host|
-    apply_manifest_on(host, <<-ORIG)
+    apply_manifest_on(host, <<-ORIG, :catch_failures => true)
       #{original_state[host][:ug_resources]}
     ORIG
   end
diff --git a/acceptance/tests/resource/host/should_query.rb b/acceptance/tests/resource/host/should_query.rb
deleted file mode 100755
index a01889a9a..000000000
--- a/acceptance/tests/resource/host/should_query.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-test_name "should query hosts out of a hosts file"
-
-agents.each do |agent|
-  file = agent.tmpfile('host-query')
-
-  step "set up the system for the test"
-  on agent, "printf '127.0.0.1 localhost.local localhost\n' > #{file}"
-
-  step "fetch the list of hosts from puppet"
-  on(agent, puppet_resource('host', 'localhost', "target=#{file}")) do
-    found = stdout.scan('present').length
-    fail_test "found #{found} hosts, not 1" if found != 1
-  end
-
-  step "clean up the system"
-  on agent, "rm -f #{file}"
-end