Merge pull request #607 from HelenCampbell/XenialTestFix
authorDavid Schmitt <david.schmitt@puppet.com>
Tue, 24 May 2016 10:44:46 +0000 (11:44 +0100)
committerDavid Schmitt <david.schmitt@puppet.com>
Tue, 24 May 2016 10:44:46 +0000 (11:44 +0100)
Removal of a breaking test for Xenial

spec/acceptance/apt_key_provider_spec.rb

index f1f232e7a992437e099302f3724c71a7d3251454..6c4fe40d8c934bdfa668e04fedd4065209083ec3 100644 (file)
@@ -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