From: Hunter Haugen Date: Mon, 24 Feb 2014 21:56:21 +0000 (-0800) Subject: Merge pull request #242 from hunner/add_unsup X-Git-Tag: 1.4.2~8 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2b9eb2949aa70d002b300dfa53d0cdc2e9cbe698;hp=fae28359479de79313a59e43edee3e229e301831;p=puppet-modules%2Fpuppetlabs-apt.git Merge pull request #242 from hunner/add_unsup Add non Debian os family unsupported test. --- diff --git a/manifests/params.pp b/manifests/params.pp index 51a01be..b35bb1c 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -35,5 +35,8 @@ class apt::params { } } } + default: { + fail("Unsupported osfamily (${::osfamily}) or lsbdistid (${::lsbdistid})") + } } } diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index f006bd5..b0bd8ab 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -37,6 +37,7 @@ class apt::unattended_upgrades ( $download_delta = "0", $verbose = "0", ) { + include apt::params validate_bool( $auto_fix, diff --git a/spec/acceptance/apt_builddep_spec.rb b/spec/acceptance/apt_builddep_spec.rb index cb01a1b..1e35e4a 100644 --- a/spec/acceptance/apt_builddep_spec.rb +++ b/spec/acceptance/apt_builddep_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'apt::builddep' do +describe 'apt::builddep', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'reset' do it 'removes packages' do diff --git a/spec/acceptance/apt_key_spec.rb b/spec/acceptance/apt_key_spec.rb index 36cba5e..9f2ba39 100644 --- a/spec/acceptance/apt_key_spec.rb +++ b/spec/acceptance/apt_key_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'apt::key' do +describe 'apt::key', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'apt::key' do it 'should work with no errors' do pp = <<-EOS diff --git a/spec/acceptance/apt_ppa_spec.rb b/spec/acceptance/apt_ppa_spec.rb index 5948461..c11da91 100644 --- 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 diff --git a/spec/acceptance/apt_source_spec.rb b/spec/acceptance/apt_source_spec.rb index 6b026b8..c2d076c 100644 --- a/spec/acceptance/apt_source_spec.rb +++ b/spec/acceptance/apt_source_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'apt::source' do +describe 'apt::source', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'apt::source' do context 'ensure => present' do diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb index 35a0d3e..7751391 100644 --- a/spec/acceptance/apt_spec.rb +++ b/spec/acceptance/apt_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'apt class' do +describe 'apt class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'reset' do it 'fixes the sources.list' do diff --git a/spec/acceptance/backports_spec.rb b/spec/acceptance/backports_spec.rb index 80e2093..6d3f7f0 100644 --- a/spec/acceptance/backports_spec.rb +++ b/spec/acceptance/backports_spec.rb @@ -8,7 +8,7 @@ when 'Debian' repos = 'main contrib non-free' end -describe 'apt::backports class' do +describe 'apt::backports class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'defaults' do it 'should work with no errors' do pp = <<-EOS diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index f228e4c..e599449 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'apt class' do +describe 'apt class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'default parameters' do # Using puppet_apply as a helper diff --git a/spec/acceptance/conf_spec.rb b/spec/acceptance/conf_spec.rb index 98898c2..8a8ed63 100644 --- a/spec/acceptance/conf_spec.rb +++ b/spec/acceptance/conf_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'apt::conf define' do +describe 'apt::conf define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'defaults' do it 'should work with no errors' do pp = <<-EOS diff --git a/spec/acceptance/force_spec.rb b/spec/acceptance/force_spec.rb index aab77a1..00572ea 100644 --- a/spec/acceptance/force_spec.rb +++ b/spec/acceptance/force_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper_acceptance' codename = fact('lsbdistcodename') -describe 'apt::force define' do +describe 'apt::force define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'defaults' do it 'should work with no errors' do pp = <<-EOS diff --git a/spec/acceptance/pin_spec.rb b/spec/acceptance/pin_spec.rb index b5a0044..4011e73 100644 --- a/spec/acceptance/pin_spec.rb +++ b/spec/acceptance/pin_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'apt::pin define' do +describe 'apt::pin define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'defaults' do it 'should work with no errors' do pp = <<-EOS diff --git a/spec/acceptance/release_spec.rb b/spec/acceptance/release_spec.rb index 81d7ca0..e7467bf 100644 --- a/spec/acceptance/release_spec.rb +++ b/spec/acceptance/release_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'apt::release class' do +describe 'apt::release class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'release_id' do it 'should work with no errors' do pp = <<-EOS diff --git a/spec/acceptance/unattended_upgrade_spec.rb b/spec/acceptance/unattended_upgrade_spec.rb index a0349d4..6a19f4e 100644 --- a/spec/acceptance/unattended_upgrade_spec.rb +++ b/spec/acceptance/unattended_upgrade_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'apt::unattended_upgrades class' do +describe 'apt::unattended_upgrades class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do context 'defaults' do it 'should work with no errors' do pp = <<-EOS diff --git a/spec/acceptance/unsupported_spec.rb b/spec/acceptance/unsupported_spec.rb new file mode 100644 index 0000000..08dca76 --- /dev/null +++ b/spec/acceptance/unsupported_spec.rb @@ -0,0 +1,10 @@ +require 'spec_helper_acceptance' + +describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do + it 'class apt fails' do + pp = <<-EOS + class { 'apt': } + EOS + expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported/i) + end +end diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 142e4a6..3352564 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -12,6 +12,8 @@ unless ENV['RS_PROVISION'] == 'no' end end +UNSUPPORTED_PLATFORMS = ['RedHat','Suse','windows','AIX','Solaris'] + RSpec.configure do |c| # Project root proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))