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
(GH-1038) add support for `check-valid-until` configuration
[puppet-modules/puppetlabs-apt.git]
/
spec
/
defines
/
ppa_spec.rb
diff --git
a/spec/defines/ppa_spec.rb
b/spec/defines/ppa_spec.rb
index 4c4dddb171d7c3479c5a8aa21a279ca12060adf2..b5aadff31a5e211994c6a3eea770989b6d870357 100644
(file)
--- a/
spec/defines/ppa_spec.rb
+++ b/
spec/defines/ppa_spec.rb
@@
-1,3
+1,5
@@
+# frozen_string_literal: true
+
require 'spec_helper'
describe 'apt::ppa' do
let :pre_condition do
require 'spec_helper'
describe 'apt::ppa' do
let :pre_condition do
@@
-7,13
+9,18
@@
describe 'apt::ppa' do
describe 'defaults' do
let :facts do
{
describe 'defaults' do
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '41.04' } },
- lsbdistrelease: '14.04',
- lsbdistcodename: 'trusty',
- operatingsystem: 'Ubuntu',
- osfamily: 'Debian',
- lsbdistid: 'Ubuntu',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '18',
+ full: '18.04',
+ },
+ distro: {
+ codename: 'trusty',
+ id: 'Ubuntu',
+ },
+ },
}
end
}
end
@@
-22,8
+29,8
@@
describe 'apt::ppa' do
it { is_expected.not_to contain_package('python-software-properties') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow+type').that_notifies('Class[Apt::Update]').with(environment: [],
it { is_expected.not_to contain_package('python-software-properties') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow+type').that_notifies('Class[Apt::Update]').with(environment: [],
- command: '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type
', # rubocop:disable Metrics
/LineLength
- unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-
such_substitution-wow_type-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow_type.gpg', # rubocop:disable Metrics
/LineLength
+ command: '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type
|| (rm /etc/apt/sources.list.d/needs-ubuntu-such_substitution-wow_type-trusty.list && false)', # rubocop:disable Layout
/LineLength
+ unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-
ubuntu-such_substitution-wow_type-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs_ubuntu_such_substitution-wow_type.gpg', # rubocop:disable Layout
/LineLength
user: 'root',
logoutput: 'on_failure')
}
user: 'root',
logoutput: 'on_failure')
}
@@
-32,13
+39,18
@@
describe 'apt::ppa' do
describe 'Ubuntu 15.10 sources.list filename' do
let :facts do
{
describe 'Ubuntu 15.10 sources.list filename' do
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '15', full: '15.10' } },
- lsbdistrelease: '15.10',
- lsbdistcodename: 'wily',
- operatingsystem: 'Ubuntu',
- osfamily: 'Debian',
- lsbdistid: 'Ubuntu',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '15',
+ full: '15.10',
+ },
+ distro: {
+ codename: 'wily',
+ id: 'Ubuntu',
+ },
+ },
}
end
}
end
@@
-46,8
+58,8
@@
describe 'apt::ppa' do
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: [],
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: [],
- command: '/usr/bin/add-apt-repository -y ppa:user/foo
',
- unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable
Metrics
/LineLength
+ command: '/usr/bin/add-apt-repository -y ppa:user/foo
|| (rm /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && false)', # rubocop:disable Layout/LineLength
+ unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable
Layout
/LineLength
user: 'root',
logoutput: 'on_failure')
}
user: 'root',
logoutput: 'on_failure')
}
@@
-65,13
+77,18
@@
describe 'apt::ppa' do
end
let :facts do
{
end
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
- lsbdistrelease: '14.04',
- lsbdistcodename: 'trusty',
- operatingsystem: 'Ubuntu',
- osfamily: 'Debian',
- lsbdistid: 'Ubuntu',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '18',
+ full: '18.04',
+ },
+ distro: {
+ codename: 'trusty',
+ id: 'Ubuntu',
+ },
+ },
}
end
}
end
@@
-80,14
+97,14
@@
describe 'apt::ppa' do
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [],
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [],
- 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow
', # rubocop:disable Metrics
/LineLength
- 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-
such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics
/LineLength
+ 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow
|| (rm /etc/apt/sources.list.d/needs-ubuntu-such_substitution-wow-trusty.list && false)', # rubocop:disable Layout
/LineLength
+ 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-
ubuntu-such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs_ubuntu_such_substitution-wow.gpg', # rubocop:disable Layout
/LineLength
'user' => 'root',
'logoutput' => 'on_failure')
}
it {
'user' => 'root',
'logoutput' => 'on_failure')
}
it {
- is_expected.to contain_file('/etc/apt/sources.list.d/needs-
such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file')
+ is_expected.to contain_file('/etc/apt/sources.list.d/needs-
ubuntu-such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file') # rubocop:disable Layout/LineLength
}
end
}
end
@@
-97,13
+114,18
@@
describe 'apt::ppa' do
end
let :facts do
{
end
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
- lsbdistrelease: '14.04',
- lsbdistcodename: 'trusty',
- operatingsystem: 'Ubuntu',
- osfamily: 'Debian',
- lsbdistid: 'Ubuntu',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '18',
+ full: '18.04',
+ },
+ distro: {
+ codename: 'trusty',
+ id: 'Ubuntu',
+ },
+ },
}
end
let :params do
}
end
let :params do
@@
-117,14
+139,14
@@
describe 'apt::ppa' do
it { is_expected.not_to contain_package('python-software-properties') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [],
it { is_expected.not_to contain_package('python-software-properties') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [],
- 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow
', # rubocop:disable Metrics
/LineLength
- 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-
such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics
/LineLength
+ 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow
|| (rm /etc/apt/sources.list.d/needs-ubuntu-such_substitution-wow-trusty.list && false)', # rubocop:disable Layout
/LineLength
+ 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-
ubuntu-such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs_ubuntu_such_substitution-wow.gpg', # rubocop:disable Layout
/LineLength
'user' => 'root',
'logoutput' => 'on_failure')
}
it {
'user' => 'root',
'logoutput' => 'on_failure')
}
it {
- is_expected.to contain_file('/etc/apt/sources.list.d/needs-
such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file')
+ is_expected.to contain_file('/etc/apt/sources.list.d/needs-
ubuntu-such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file') # rubocop:disable Layout/LineLength
}
end
}
end
@@
-136,13
+158,18
@@
describe 'apt::ppa' do
end
let :facts do
{
end
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
- lsbdistrelease: '14.04',
- lsbdistcodename: 'trusty',
- operatingsystem: 'Ubuntu',
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '18',
+ full: '18.04',
+ },
+ distro: {
+ codename: 'trusty',
+ id: 'Ubuntu',
+ },
+ },
}
end
let :params do
}
end
let :params do
@@
-158,8
+185,8
@@
describe 'apt::ppa' do
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: [],
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: [],
- command: '/usr/bin/add-apt-repository ppa:user/foo
',
- unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-
foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics
/LineLength
+ command: '/usr/bin/add-apt-repository ppa:user/foo
|| (rm /etc/apt/sources.list.d/user-ubuntu-foo-trusty.list && false)', # rubocop:disable Layout/LineLength
+ unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-
ubuntu-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable Layout
/LineLength
user: 'root',
logoutput: 'on_failure')
}
user: 'root',
logoutput: 'on_failure')
}
@@
-173,13
+200,18
@@
describe 'apt::ppa' do
end
let :facts do
{
end
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
- lsbdistrelease: '14.04',
- lsbdistcodename: 'trusty',
- operatingsystem: 'Ubuntu',
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '18',
+ full: '18.04',
+ },
+ distro: {
+ codename: 'trusty',
+ id: 'Ubuntu',
+ },
+ },
}
end
let :params do
}
end
let :params do
@@
-193,8
+225,8
@@
describe 'apt::ppa' do
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8080'],
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8080'],
- command: '/usr/bin/add-apt-repository ppa:user/foo
',
- unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-
foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics
/LineLength
+ command: '/usr/bin/add-apt-repository ppa:user/foo
|| (rm /etc/apt/sources.list.d/user-ubuntu-foo-trusty.list && false)', # rubocop:disable Layout/LineLength
+ unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-
ubuntu-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable Layout
/LineLength
user: 'root',
logoutput: 'on_failure')
}
user: 'root',
logoutput: 'on_failure')
}
@@
-208,13
+240,18
@@
describe 'apt::ppa' do
end
let :facts do
{
end
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
- lsbdistrelease: '14.04',
- lsbdistcodename: 'trusty',
- operatingsystem: 'Ubuntu',
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '18',
+ full: '18.04',
+ },
+ distro: {
+ codename: 'trusty',
+ id: 'Ubuntu',
+ },
+ },
}
end
let :params do
}
end
let :params do
@@
-228,8
+265,8
@@
describe 'apt::ppa' do
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8180'],
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8180'],
- command: '/usr/bin/add-apt-repository ppa:user/foo
',
- unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-
foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics
/LineLength
+ command: '/usr/bin/add-apt-repository ppa:user/foo
|| (rm /etc/apt/sources.list.d/user-ubuntu-foo-trusty.list && false)', # rubocop:disable Layout/LineLength
+ unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-
ubuntu-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable Layout
/LineLength
user: 'root',
logoutput: 'on_failure')
}
user: 'root',
logoutput: 'on_failure')
}
@@
-243,13
+280,18
@@
describe 'apt::ppa' do
end
let :facts do
{
end
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
- lsbdistrelease: '14.04',
- lsbdistcodename: 'trusty',
- operatingsystem: 'Ubuntu',
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '18',
+ full: '18.04',
+ },
+ distro: {
+ codename: 'trusty',
+ id: 'Ubuntu',
+ },
+ },
}
end
let :params do
}
end
let :params do
@@
-263,8
+305,8
@@
describe 'apt::ppa' do
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8180', 'https_proxy=https://localhost:8180'],
it { is_expected.to contain_package('software-properties-common') }
it {
is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8180', 'https_proxy=https://localhost:8180'],
- command: '/usr/bin/add-apt-repository ppa:user/foo
',
- unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-
foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics
/LineLength
+ command: '/usr/bin/add-apt-repository ppa:user/foo
|| (rm /etc/apt/sources.list.d/user-ubuntu-foo-trusty.list && false)', # rubocop:disable Layout/LineLength
+ unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-
ubuntu-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable Layout
/LineLength
user: 'root',
logoutput: 'on_failure')
}
user: 'root',
logoutput: 'on_failure')
}
@@
-276,13
+318,18
@@
describe 'apt::ppa' do
end
let :facts do
{
end
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
- lsbdistrelease: '14.04',
- lsbdistcodename: 'trusty',
- operatingsystem: 'Ubuntu',
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '18',
+ full: '18.04',
+ },
+ distro: {
+ codename: 'trusty',
+ id: 'Ubuntu',
+ },
+ },
}
end
let(:title) { 'ppa:user/foo' }
}
end
let(:title) { 'ppa:user/foo' }
@@
-293,7
+340,7
@@
describe 'apt::ppa' do
end
it {
end
it {
- is_expected.to contain_file('/etc/apt/sources.list.d/user-foo-trusty.list').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
+ is_expected.to contain_file('/etc/apt/sources.list.d/user-
ubuntu-
foo-trusty.list').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
}
end
}
end
@@
-301,32
+348,42
@@
describe 'apt::ppa' do
describe 'no release' do
let :facts do
{
describe 'no release' do
let :facts do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
- lsbdistrelease: '14.04',
- operatingsystem: 'Ubuntu',
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- lsbdistcodeanme: nil,
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '18',
+ full: '18.04',
+ },
+ distro: {
+ codename: nil,
+ id: 'Ubuntu',
+ },
+ },
}
end
let(:title) { 'ppa:user/foo' }
it do
}
end
let(:title) { 'ppa:user/foo' }
it do
- is_expected.to raise_error(Puppet::Error, %r{
lsbdist
codename fact not available: release parameter required})
+ is_expected.to raise_error(Puppet::Error, %r{
os.distro.
codename fact not available: release parameter required})
end
end
describe 'not ubuntu' do
let :facts do
{
end
end
describe 'not ubuntu' do
let :facts do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '6', full: '6.0.7' } },
- lsbdistrelease: '6.0.7',
- lsbdistcodename: 'wheezy',
- operatingsystem: 'Debian',
- lsbdistid: 'debian',
- osfamily: 'Debian',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '6',
+ full: '6.0.7',
+ },
+ distro: {
+ codename: 'wheezy',
+ id: 'Debian',
+ },
+ },
}
end
let(:title) { 'ppa:user/foo' }
}
end
let(:title) { 'ppa:user/foo' }