summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
d0b8ed8)
And this will make merging back to master cleaner
- 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)
- 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
+
+ context 'reset' do
+ it { shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2]) }
+ 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__), '..'))
RSpec.configure do |c|
# Project root
proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))