From e2b7ef2da2213dd3f7ae9bf4f4dde0e0db9f1ab4 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Fri, 21 Feb 2014 11:45:21 -0800
Subject: [PATCH] Using rspec filters works better

And this will make merging back to master cleaner
---
 spec/acceptance/apt_ppa_spec.rb | 42 ++++++++++++++++-----------------
 spec/spec_helper_acceptance.rb  |  2 --
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/spec/acceptance/apt_ppa_spec.rb b/spec/acceptance/apt_ppa_spec.rb
index 60e6d4d..5948461 100644
--- a/spec/acceptance/apt_ppa_spec.rb
+++ b/spec/acceptance/apt_ppa_spec.rb
@@ -70,31 +70,29 @@ if fact('operatingsystem') == 'Ubuntu'
       end
     end
 
-    if ! default[:platform].match(/10\.04/)
-      context 'options' do
-        context '-y' do
-          it 'works without failure' do
-            pp = <<-EOS
-            include '::apt'
-            apt::ppa { 'ppa:canonical-kernel-team/ppa':
-              release => precise,
-              options => '-y',
-            }
-            EOS
-
-            shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2])
-            apply_manifest(pp, :catch_failures => true)
-          end
-
-          describe file('/etc/apt/sources.list.d/canonical-kernel-team-ppa-precise.list') do
-            it { should be_file }
-          end
+    context 'options' do
+      context '-y', :unless => default[:platform].match(/10\.04/) do
+        it 'works without failure' do
+          pp = <<-EOS
+          include '::apt'
+          apt::ppa { 'ppa:canonical-kernel-team/ppa':
+            release => precise,
+            options => '-y',
+          }
+          EOS
+
+          shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2])
+          apply_manifest(pp, :catch_failures => true)
         end
-      end
 
-      context 'reset' do
-        it { shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2]) }
+        describe file('/etc/apt/sources.list.d/canonical-kernel-team-ppa-precise.list') do
+          it { should be_file }
+        end
       end
     end
+
+    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
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 37afbfc..142e4a6 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -12,8 +12,6 @@ unless ENV['RS_PROVISION'] == 'no'
   end
 end
 
-UNSUPPORTED_PLATFORMS = ['windows','aix','solaris',/el-(4|5|6)/]
-
 RSpec.configure do |c|
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-- 
2.32.3