From: David Schmitt <david.schmitt@puppet.com>
Date: Tue, 24 May 2016 10:44:46 +0000 (+0100)
Subject: Merge pull request #607 from HelenCampbell/XenialTestFix
X-Git-Tag: 2.3.0~15
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e0ee0995bb5153d35c1ea32ca9e864ac19c226fa;hp=39870ce9849d1915eeaf3137f17462bc8b2f6a62;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #607 from HelenCampbell/XenialTestFix

Removal of a breaking test for Xenial
---

diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
index f1f232e..6c4fe40 100644
--- a/spec/acceptance/apt_key_provider_spec.rb
+++ b/spec/acceptance/apt_key_provider_spec.rb
@@ -684,21 +684,6 @@ ZTQcCD53HcBLvKX6RJ4ByYawKaQqMa27WK/YWVmFXqVDVk12iKrQW6zktDdGInnD
         apply_manifest(pp, :catch_failures => true)
         shell(PUPPETLABS_KEY_CHECK_COMMAND)
       end
-
-      it 'fails on invalid options' do
-        pp = <<-EOS
-        apt_key { 'puppetlabs':
-          id      => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure  => 'present',
-          options => 'this is totally bonkers',
-        }
-        EOS
-
-        shell("apt-key del #{PUPPETLABS_GPG_KEY_FINGERPRINT}", :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/--keyserver-options this is totally/)
-        end
-      end
     end
   end