Merge pull request #235 from daenney/readme-license-fixes

[puppet-modules/puppetlabs-apt.git] / spec / acceptance / apt_ppa_spec.rb

diff --git a/spec/acceptance/apt_ppa_spec.rb b/spec/acceptance/apt_ppa_spec.rb
index c0d216107de96913cebfaae9de713df8eff30958..b665c5cf477a84a5d74590163ebe7ae1d6a0dc35 100644 (file)
--- a/spec/acceptance/apt_ppa_spec.rb
+++ b/spec/acceptance/apt_ppa_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 if fact('operatingsystem') == 'Ubuntu'
-  describe 'apt::ppa' do
+  describe 'apt::ppa', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
 
     context 'reset' do
       it 'removes ppa' do
@@ -27,14 +27,13 @@ if fact('operatingsystem') == 'Ubuntu'
       end
     end
 
-    context 'readding a removed ppa.' do
+    context 'reading a removed ppa.' do
       it 'setup' do
-        shell('add-apt-repository -y ppa:raravena80/collectd5')
         # This leaves a blank file
-        shell('add-apt-repository --remove ppa:raravena80/collectd5')
+        shell('echo > /etc/apt/sources.list.d/raravena80-collectd5-$(lsb_release -c -s).list')
       end
 
-      it 'should readd it successfully' do
+      it 'should read it successfully' do
         pp = <<-EOS
         include '::apt'
         apt::ppa { 'ppa:raravena80/collectd5': }
@@ -111,7 +110,7 @@ if fact('operatingsystem') == 'Ubuntu'
     end
 
     context 'options' do
-      context '-y' do
+      context '-y', :unless => default[:platform].match(/10\.04/) do
         it 'works without failure' do
           pp = <<-EOS
           include '::apt'
@@ -135,6 +134,5 @@ if fact('operatingsystem') == 'Ubuntu'
     context 'reset' do
       it { shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2]) }
     end
-
   end
 end