From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Wed, 30 Jul 2014 19:09:40 +0000 (-0400)
Subject: Merge pull request #336 from mhaskel/fix_acceptance_tests
X-Git-Tag: 1.6.0~6
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a68eca58a658e432fbfffcd91862134082ac7dc0;hp=84b53dcde475d8573f0a609e30b5f876dd08aa69;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #336 from mhaskel/fix_acceptance_tests

Debian seems to have hanging apt-get and/or dpkg processes, so kill
---

diff --git a/spec/acceptance/unattended_upgrade_spec.rb b/spec/acceptance/unattended_upgrade_spec.rb
index 6a19f4e..09f4e2b 100644
--- a/spec/acceptance/unattended_upgrade_spec.rb
+++ b/spec/acceptance/unattended_upgrade_spec.rb
@@ -10,8 +10,8 @@ describe 'apt::unattended_upgrades class', :unless => UNSUPPORTED_PLATFORMS.incl
 
       # Attempted workaround for problems seen on debian with
       # something holding the package database open.
-      #shell('killall -9 apt-get')
-      #shell('killall -9 dpkg')
+      shell('killall -9 apt-get', { :acceptable_exit_codes => [0,1] })
+      shell('killall -9 dpkg', { :acceptable_exit_codes => [0,1] })
       apply_manifest(pp, :catch_failures => true)
     end