X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fppa_spec.rb;h=b0e689e236f24bd4291f031bef441d3569f36365;hb=c5259f83ad20d120d502d8541c75f4ee6021fec8;hp=f9ea8cefb5df459401f83a9eb25cd23fc20d34b3;hpb=7c489e05ff0e4b1a948ce18c994067f42f91d2fb;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb index f9ea8ce..b0e689e 100644 --- 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 @@ -13,7 +15,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', - puppetversion: Puppet.version, } end @@ -22,8 +23,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: [], - command: '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type || rm /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list && false', # rubocop:disable Metrics/LineLength - unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list', # rubocop:disable Metrics/LineLength + command: '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type || (rm /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list && false)', # rubocop:disable Layout/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 Layout/LineLength user: 'root', logoutput: 'on_failure') } @@ -38,7 +39,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', - puppetversion: Puppet.version, } end @@ -46,8 +46,8 @@ describe 'apt::ppa' do 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 || rm /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && false', # rubocop:disable Metrics/LineLength - unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-ubuntu-foo-wily.list', + 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') } @@ -71,7 +71,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', - puppetversion: Puppet.version, } end @@ -80,8 +79,8 @@ 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' => [], - 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false', # rubocop:disable Metrics/LineLength - 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list', # rubocop:disable Metrics/LineLength + 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || (rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false)', # rubocop:disable Layout/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 Layout/LineLength 'user' => 'root', 'logoutput' => 'on_failure') } @@ -103,7 +102,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', - puppetversion: Puppet.version, } end let :params do @@ -117,8 +115,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').that_notifies('Class[Apt::Update]').with('environment' => [], - 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false', # rubocop:disable Metrics/LineLength - 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list', # rubocop:disable Metrics/LineLength + 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || (rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false)', # rubocop:disable Layout/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 Layout/LineLength 'user' => 'root', 'logoutput' => 'on_failure') } @@ -142,7 +140,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -158,8 +155,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: [], - command: '/usr/bin/add-apt-repository ppa:user/foo || rm /etc/apt/sources.list.d/user-foo-trusty.list && false', # rubocop:disable Metrics/LineLength - unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list', + command: '/usr/bin/add-apt-repository ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Layout/LineLength + 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 Layout/LineLength user: 'root', logoutput: 'on_failure') } @@ -179,7 +176,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -193,8 +189,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'], - command: '/usr/bin/add-apt-repository ppa:user/foo || rm /etc/apt/sources.list.d/user-foo-trusty.list && false', # rubocop:disable Metrics/LineLength - unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list', + command: '/usr/bin/add-apt-repository ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Layout/LineLength + 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 Layout/LineLength user: 'root', logoutput: 'on_failure') } @@ -214,7 +210,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -228,8 +223,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'], - command: '/usr/bin/add-apt-repository ppa:user/foo || rm /etc/apt/sources.list.d/user-foo-trusty.list && false', # rubocop:disable Metrics/LineLength - unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list', + command: '/usr/bin/add-apt-repository ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Layout/LineLength + 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 Layout/LineLength user: 'root', logoutput: 'on_failure') } @@ -249,7 +244,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -263,8 +257,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'], - command: '/usr/bin/add-apt-repository ppa:user/foo || rm /etc/apt/sources.list.d/user-foo-trusty.list && false', # rubocop:disable Metrics/LineLength - unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list', + command: '/usr/bin/add-apt-repository ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Layout/LineLength + 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 Layout/LineLength user: 'root', logoutput: 'on_failure') } @@ -282,7 +276,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let(:title) { 'ppa:user/foo' } @@ -307,7 +300,6 @@ describe 'apt::ppa' do lsbdistid: 'Ubuntu', osfamily: 'Debian', lsbdistcodeanme: nil, - puppetversion: Puppet.version, } end let(:title) { 'ppa:user/foo' } @@ -326,7 +318,6 @@ describe 'apt::ppa' do operatingsystem: 'Debian', lsbdistid: 'debian', osfamily: 'Debian', - puppetversion: Puppet.version, } end let(:title) { 'ppa:user/foo' }