X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fppa_spec.rb;h=fa893b6997272429aac97883c1cd48328edbd368;hb=ffc83eae79851c841135a6f50e36009d16a3b774;hp=5080a876bb86b13adb86840d6c9c96cbee38a3ca;hpb=08c8b582647f76fa22ee07d49c38ae029fe079a1;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
index 5080a87..fa893b6 100644
--- a/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@ -7,108 +7,87 @@ describe 'apt::ppa' do
   describe 'defaults' do
     let :facts do
       {
-        :lsbdistrelease  => '11.04',
-        :lsbdistcodename => 'natty',
-        :operatingsystem => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :lsbdistid       => 'Ubuntu',
-        :puppetversion   => Puppet.version,
+        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,
       }
     end
 
     let(:title) { 'ppa:needs/such.substitution/wow+type' }
-    it { is_expected.to_not 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',
-      :unless      => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow_type-natty.list',
-      :user        => 'root',
-      :logoutput   => 'on_failure',
-    })
-    }
-  end
 
-  describe 'ppa depending on ppa, MODULES-1156' do
-    let :pre_condition do
-      'class { "apt": }'
-    end
+    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 && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow_type.gpg', # rubocop:disable Metrics/LineLength
+                                                                                                                                      user: 'root',
+                                                                                                                                      logoutput: 'on_failure')
+    }
   end
 
-  describe 'package_name => software-properties-common' do
-    let :pre_condition do
-      'class { "apt": }'
-    end
-    let :params do
-      {
-        :package_name   => 'software-properties-common',
-        :package_manage => true,
-      }
-    end
+  describe 'Ubuntu 15.10 sources.list filename' do
     let :facts do
       {
-        :lsbdistrelease  => '11.04',
-        :lsbdistcodename => 'natty',
-        :operatingsystem => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :lsbdistid       => 'Ubuntu',
-        :puppetversion   => Puppet.version,
+        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,
       }
     end
 
-    let(:title) { 'ppa:needs/such.substitution/wow' }
-    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',
-      'unless'      => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list',
-      'user'        => 'root',
-      'logoutput'   => 'on_failure',
-    })
-    }
+    let(:title) { 'ppa:user/foo' }
 
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with({
-      'ensure' => 'file',
-    })
+    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 && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable Metrics/LineLength
+                                                                                                              user: 'root',
+                                                                                                              logoutput: 'on_failure')
     }
   end
 
-  describe 'package_manage => true, multiple ppas, MODULES-2873' do
+  describe 'package_name => software-properties-common' do
     let :pre_condition do
-      'class { "apt": }
-       apt::ppa {"ppa:foo":
-         package_manage => true
-       }'
+      'class { "apt": }'
     end
-    let :facts do
+    let :params do
       {
-        :lsbdistrelease  => '11.04',
-        :lsbdistcodename => 'natty',
-        :operatingsystem => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :lsbdistid       => 'Ubuntu',
-        :puppetversion   => Puppet.version,
+        package_name: 'software-properties-common',
+        package_manage: true,
       }
     end
-    let :params do
+    let :facts do
       {
-        :package_manage => true,
+        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,
       }
     end
 
-    let(:title) { 'ppa:bar' }
-    it { is_expected.to contain_package('python-software-properties') }
-    it { is_expected.to contain_exec('add-apt-repository-ppa:bar').that_notifies('Class[Apt::Update]').with({
-      'environment' => [],
-      'command'     => '/usr/bin/add-apt-repository -y ppa:bar',
-      'unless'      => '/usr/bin/test -s /etc/apt/sources.list.d/bar-natty.list',
-      'user'        => 'root',
-      'logoutput'   => 'on_failure',
-    })
+    let(:title) { 'ppa:needs/such.substitution/wow' }
+
+    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 && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics/LineLength
+                                                                                                                                 'user'        => 'root',
+                                                                                                                                 'logoutput'   => 'on_failure')
     }
 
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/bar-natty.list').that_requires('Exec[add-apt-repository-ppa:bar]').with({
-      'ensure' => 'file',
-    })
+    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')
     }
   end
 
@@ -118,70 +97,71 @@ describe 'apt::ppa' do
     end
     let :facts do
       {
-        :lsbdistrelease  => '11.04',
-        :lsbdistcodename => 'natty',
-        :operatingsystem => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :lsbdistid       => 'Ubuntu',
-        :puppetversion   => Puppet.version,
+        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,
       }
     end
     let :params do
       {
-        :package_manage => false,
+        package_manage: false,
       }
     end
 
     let(:title) { 'ppa:needs/such.substitution/wow' }
-    it { is_expected.to_not 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',
-      'unless'      => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list',
-      'user'        => 'root',
-      'logoutput'   => 'on_failure',
-    })
+
+    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 && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics/LineLength
+                                                                                                                                 'user'        => 'root',
+                                                                                                                                 'logoutput'   => 'on_failure')
     }
 
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with({
-      'ensure' => 'file',
-    })
+    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')
     }
   end
 
   describe 'apt included, no proxy' do
     let :pre_condition do
       'class { "apt": }
-      apt::ppa { "ppa:foo2": }
+      apt::ppa { "ppa:user/foo2": }
       '
     end
     let :facts do
       {
-        :lsbdistrelease  => '14.04',
-        :lsbdistcodename => 'trusty',
-        :operatingsystem => 'Ubuntu',
-        :lsbdistid       => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :puppetversion   => Puppet.version,
+        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,
       }
     end
     let :params do
       {
-        :options        => '',
-        :package_manage => true,
-        :require        => 'Apt::Ppa[ppa:foo2]',
+        options: '',
+        package_manage: true,
+        require: 'Apt::Ppa[ppa:user/foo2]',
       }
     end
-    let(:title) { 'ppa:foo' }
+    let(:title) { 'ppa:user/foo' }
+
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to contain_package('software-properties-common') }
-    it { is_expected.to contain_exec('add-apt-repository-ppa:foo').that_notifies('Class[Apt::Update]').with({
-      :environment => [],
-      :command     => '/usr/bin/add-apt-repository  ppa:foo',
-      :unless      => '/usr/bin/test -s /etc/apt/sources.list.d/foo-trusty.list',
-      :user        => 'root',
-      :logoutput   => 'on_failure',
-    })
+    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 && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
+                                                                                                              user: 'root',
+                                                                                                              logoutput: 'on_failure')
     }
   end
 
@@ -193,12 +173,13 @@ describe 'apt::ppa' do
     end
     let :facts do
       {
-        :lsbdistrelease  => '14.04',
-        :lsbdistcodename => 'trusty',
-        :operatingsystem => 'Ubuntu',
-        :lsbdistid       => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :puppetversion   => Puppet.version,
+        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,
       }
     end
     let :params do
@@ -207,15 +188,15 @@ describe 'apt::ppa' do
         'package_manage' => true,
       }
     end
-    let(:title) { 'ppa:foo' }
+    let(:title) { 'ppa:user/foo' }
+
     it { is_expected.to contain_package('software-properties-common') }
-    it { is_expected.to contain_exec('add-apt-repository-ppa:foo').that_notifies('Class[Apt::Update]').with({
-      :environment => ['http_proxy=http://localhost:8080'],
-      :command     => '/usr/bin/add-apt-repository  ppa:foo',
-      :unless      => '/usr/bin/test -s /etc/apt/sources.list.d/foo-trusty.list',
-      :user        => 'root',
-      :logoutput   => 'on_failure',
-    })
+    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 && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
+                                                                                                              user: 'root',
+                                                                                                              logoutput: 'on_failure')
     }
   end
 
@@ -227,29 +208,30 @@ describe 'apt::ppa' do
     end
     let :facts do
       {
-        :lsbdistrelease  => '14.04',
-        :lsbdistcodename => 'trusty',
-        :operatingsystem => 'Ubuntu',
-        :lsbdistid       => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :puppetversion   => Puppet.version,
+        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,
       }
     end
     let :params do
       {
-        :options => '',
-        :package_manage => true,
+        options: '',
+        package_manage: true,
       }
     end
-    let(:title) { 'ppa:foo' }
+    let(:title) { 'ppa:user/foo' }
+
     it { is_expected.to contain_package('software-properties-common') }
-    it { is_expected.to contain_exec('add-apt-repository-ppa:foo').that_notifies('Class[Apt::Update]').with({
-      :environment => ['http_proxy=http://localhost:8180'],
-      :command     => '/usr/bin/add-apt-repository  ppa:foo',
-      :unless      => '/usr/bin/test -s /etc/apt/sources.list.d/foo-trusty.list',
-      :user        => 'root',
-      :logoutput   => 'on_failure',
-    })
+    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 && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
+                                                                                                              user: 'root',
+                                                                                                              logoutput: 'on_failure')
     }
   end
 
@@ -261,29 +243,30 @@ describe 'apt::ppa' do
     end
     let :facts do
       {
-        :lsbdistrelease  => '14.04',
-        :lsbdistcodename => 'trusty',
-        :operatingsystem => 'Ubuntu',
-        :lsbdistid       => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :puppetversion   => Puppet.version,
+        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,
       }
     end
     let :params do
       {
-        :options => '',
-        :package_manage => true,
+        options: '',
+        package_manage: true,
       }
     end
-    let(:title) { 'ppa:foo' }
+    let(:title) { 'ppa:user/foo' }
+
     it { is_expected.to contain_package('software-properties-common') }
-    it { is_expected.to contain_exec('add-apt-repository-ppa: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:foo',
-      :unless      => '/usr/bin/test -s /etc/apt/sources.list.d/foo-trusty.list',
-      :user        => 'root',
-      :logoutput   => 'on_failure',
-    })
+    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 && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
+                                                                                                              user: 'root',
+                                                                                                              logoutput: 'on_failure')
     }
   end
 
@@ -293,62 +276,63 @@ describe 'apt::ppa' do
     end
     let :facts do
       {
-        :lsbdistrelease  => '14.04',
-        :lsbdistcodename => 'trusty',
-        :operatingsystem => 'Ubuntu',
-        :lsbdistid       => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :puppetversion   => Puppet.version,
+        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,
       }
     end
-    let(:title) { 'ppa:foo' }
+    let(:title) { 'ppa:user/foo' }
     let :params do
       {
-        :ensure => 'absent'
+        ensure: 'absent',
       }
     end
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/foo-trusty.list').that_notifies('Class[Apt::Update]').with({
-      :ensure => 'absent',
-    })
+
+    it {
+      is_expected.to contain_file('/etc/apt/sources.list.d/user-foo-trusty.list').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
     }
   end
 
-  context 'validation' do
+  context 'with validation' do
     describe 'no release' do
       let :facts do
         {
-          :lsbdistrelease  => '14.04',
-          :operatingsystem => 'Ubuntu',
-          :lsbdistid       => 'Ubuntu',
-          :osfamily        => 'Debian',
-          :lsbdistcodeanme => nil,
-          :puppetversion   => Puppet.version,
+          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,
         }
       end
-      let(:title) { 'ppa:foo' }
+      let(:title) { 'ppa:user/foo' }
+
       it do
-        expect {
-          subject.call
-        }.to raise_error(Puppet::Error, /lsbdistcodename fact not available: release parameter required/)
+        is_expected.to raise_error(Puppet::Error, %r{lsbdistcodename fact not available: release parameter required})
       end
     end
 
     describe 'not ubuntu' do
       let :facts do
         {
-          :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' } },
+          lsbdistrelease: '6.0.7',
+          lsbdistcodename: 'wheezy',
+          operatingsystem: 'Debian',
+          lsbdistid: 'debian',
+          osfamily: 'Debian',
+          puppetversion: Puppet.version,
         }
       end
-      let(:title) { 'ppa:foo' }
+      let(:title) { 'ppa:user/foo' }
+
       it do
-        expect {
-          subject.call
-        }.to raise_error(Puppet::Error, /not currently supported on Debian/)
+        is_expected.to raise_error(Puppet::Error, %r{not currently supported on Debian})
       end
     end
   end