From: Bryan Jen Date: Mon, 26 Sep 2016 16:25:23 +0000 (+0100) Subject: Merge pull request #624 from seffenberg-naspers/fix_apt_key_with_userinfo X-Git-Tag: 2.4.0~21 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6e82d2f5aa579efc4318c6c366125ff20ff45f1e;p=puppet-modules%2Fpuppetlabs-apt.git Merge pull request #624 from seffenberg-naspers/fix_apt_key_with_userinfo apt_key now really works with userinfo for http(s) --- 6e82d2f5aa579efc4318c6c366125ff20ff45f1e diff --cc spec/unit/puppet/type/apt_key_spec.rb index 7cd80c6,b17c8ae..9c2dd91 --- a/spec/unit/puppet/type/apt_key_spec.rb +++ b/spec/unit/puppet/type/apt_key_spec.rb @@@ -136,9 -136,16 +136,16 @@@ describe Puppet::Type::type(:apt_key) d )}.to_not raise_error end + it 'allows the http URI with username and password' do + expect { Puppet::Type.type(:apt_key).new( + :id => '4BD6EC30', + :source => 'http://testme:Password2@pgp.mit.edu' + )}.to_not raise_error + end + it 'allows the https URI scheme in source' do expect { Puppet::Type.type(:apt_key).new( - :id => '4BD6EC30', + :id => 'EF8D349F', :source => 'https://pgp.mit.edu' )}.to_not raise_error end