Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add security warning re: short keys
[puppet-modules/puppetlabs-apt.git]
/
spec
/
defines
/
source_spec.rb
diff --git
a/spec/defines/source_spec.rb
b/spec/defines/source_spec.rb
index 32aa6c8dcb11d8ceae4c74857c5320acacdd50b0..9da8b235feff81e8623d255d8d2796ba7dc77454 100644
(file)
--- a/
spec/defines/source_spec.rb
+++ b/
spec/defines/source_spec.rb
@@
-1,5
+1,6
@@
require 'spec_helper'
describe 'apt::source', :type => :define do
require 'spec_helper'
describe 'apt::source', :type => :define do
+ let(:facts) { { :lsbdistid => 'Debian' } }
let :title do
'my_source'
end
let :title do
'my_source'
end
@@
-48,6
+49,9
@@
describe 'apt::source', :type => :define do
},
{
:release => 'custom',
},
{
:release => 'custom',
+ },
+ {
+ :architecture => 'amd64',
}
].each do |param_set|
describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
}
].each do |param_set|
describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
@@
-56,7
+60,7
@@
describe 'apt::source', :type => :define do
end
let :facts do
end
let :facts do
- {:lsbdistcodename => 'karmic'}
+ {:lsbdistcodename => 'karmic'
, :lsbdistid => 'Ubuntu'
}
end
let :params do
end
let :params do
@@
-69,9
+73,13
@@
describe 'apt::source', :type => :define do
let :content do
content = "# #{title}"
let :content do
content = "# #{title}"
- content << "\ndeb #{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
+ if param_hash[:architecture]
+ arch = "[arch=#{param_hash[:architecture]}] "
+ end
+ content << "\ndeb #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
+
if param_hash[:include_src]
if param_hash[:include_src]
- content << "deb-src #{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
+ content << "deb-src #{
arch}#{
param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
end
content
end
end
content
end
@@
-153,7
+161,7
@@
describe 'apt::source', :type => :define do
let(:default_params) { Hash.new }
let(:facts) { Hash.new }
it { expect { should raise_error(Puppet::Error) } }
let(:default_params) { Hash.new }
let(:facts) { Hash.new }
it { expect { should raise_error(Puppet::Error) } }
- let(:facts) { { :lsbdistcodename => 'lucid' } }
+ let(:facts) { { :lsbdistcodename => 'lucid'
, :lsbdistid => 'Ubuntu'
} }
it { should contain_apt__source(title) }
end
end
it { should contain_apt__source(title) }
end
end