e3784987fc
apt::ppa and apt::builddep requires apt class. The anchor introduced for containment of apt-get update causes a dependency loop. apt::ppa appears to depend on apt class sources.d direcory. While apt::builddep have no clear reason for a dependency on apt class. This change refactor both define type, so they no longer cause a dependency loop.
68 lines
2 KiB
Ruby
68 lines
2 KiB
Ruby
require 'spec_helper'
|
|
describe 'apt::ppa', :type => :define do
|
|
['ppa:dans_ppa', 'dans_ppa','ppa:dans-daily/ubuntu'].each do |t|
|
|
describe "with title #{t}" do
|
|
let :pre_condition do
|
|
'class { "apt": }'
|
|
end
|
|
let :facts do
|
|
{:lsbdistcodename => 'natty'}
|
|
end
|
|
let :title do
|
|
t
|
|
end
|
|
let :release do
|
|
"natty"
|
|
end
|
|
let :filename do
|
|
t.sub(/^ppa:/,'').gsub('/','-') << "-" << "#{release}.list"
|
|
end
|
|
|
|
it { should contain_package("python-software-properties") }
|
|
|
|
it { should contain_exec("apt_update").with(
|
|
'command' => '/usr/bin/apt-get update',
|
|
'refreshonly' => true
|
|
)
|
|
}
|
|
|
|
it { should contain_exec("add-apt-repository-#{t}").with(
|
|
'command' => "/usr/bin/add-apt-repository #{t}",
|
|
'creates' => "/etc/apt/sources.list.d/#{filename}",
|
|
'require' => ["File[/etc/apt/sources.list.d]", "Package[python-software-properties]"],
|
|
'notify' => "Exec[apt_update]"
|
|
)
|
|
}
|
|
|
|
it { should create_file("/etc/apt/sources.list.d/#{filename}").with(
|
|
'ensure' => 'file',
|
|
'require' => "Exec[add-apt-repository-#{t}]"
|
|
)
|
|
}
|
|
end
|
|
end
|
|
|
|
describe "it should not error if package['python-software-properties'] is already defined" do
|
|
let :pre_condition do
|
|
'class {"apt": }' +
|
|
'package { "python-software-properties": }->Apt::Ppa["ppa"]'
|
|
end
|
|
let :facts do
|
|
{:lsbdistcodename => 'natty'}
|
|
end
|
|
let(:title) { "ppa" }
|
|
let(:release) { "natty" }
|
|
it { should contain_package("python-software-properties") }
|
|
end
|
|
|
|
describe "without Class[apt] should raise a Puppet::Error" do
|
|
let(:release) { "natty" }
|
|
let(:title) { "ppa" }
|
|
it { expect { should contain_apt__ppa(title) }.to raise_error(Puppet::Error) }
|
|
end
|
|
|
|
describe "without release should raise a Puppet::Error" do
|
|
let(:title) { "ppa:" }
|
|
it { expect { should contain_apt__ppa(:release) }.to raise_error(Puppet::Error) }
|
|
end
|
|
end
|