From 723382db55e6e3aebf9abdee83573f92f35071f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 12 Aug 2015 15:03:17 +0200 Subject: Fix unit tests --- spec/classes/augeas_spec.rb | 138 +++++++++++++++++++++++--------------------- 1 file changed, 73 insertions(+), 65 deletions(-) (limited to 'spec/classes/augeas_spec.rb') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index ab4241f..32a390d 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -5,69 +5,76 @@ describe 'augeas' do context 'when on an unsupported Operating System' do let (:facts) do { - :osfamily => 'MS-DOS', + :osfamily => 'MS-DOS', + :puppetversion => Puppet.version, } end it 'should fail' do - expect { is_expected.to contain_package('ruby-augeas') }.to raise_error(Puppet::Error, /Unsupported OS family/) + expect { is_expected.to compile }.to raise_error(/Unsupported OS family/) end end + lens_dir = Puppet.version < '4.0.0' ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses' + on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do - facts + facts.merge({ + :puppetversion => Puppet.version, + }) end context 'without params' do - case facts[:osfamily] - when 'Debian' - it { is_expected.to contain_package('libaugeas0').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => 'present' - ) } - case facts[:lsbdistcodename] - when 'squeeze', 'lucid', 'precise' - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => 'present', - :name => 'libaugeas-ruby1.8' + if Puppet.version < '4.0.0' + case facts[:osfamily] + when 'Debian' + it { is_expected.to contain_package('libaugeas0').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-tools').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-lenses').with( + :ensure => 'present' + ) } + case facts[:lsbdistcodename] + when 'squeeze', 'lucid', 'precise' + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.8' + ) } + else + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.9.1' + ) } + end + when 'RedHat' + it { is_expected.to contain_package('augeas').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-libs').with( + :ensure => 'present' ) } - else it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', - :name => 'libaugeas-ruby1.9.1' + :name => 'ruby-augeas' ) } end - when 'RedHat' - it { is_expected.to contain_package('augeas').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-libs').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => 'present', - :name => 'ruby-augeas' - ) } end - it { is_expected.to contain_file('/usr/share/augeas/lenses').with( + it { is_expected.to contain_file(lens_dir).with( :ensure => 'directory', :purge => 'true', :force => 'true', :recurse => 'true', :recurselimit => 1 ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( + it { is_expected.to contain_file("#{lens_dir}/dist").with( :ensure => 'directory', :purge => 'false' ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( + it { is_expected.to contain_file("#{lens_dir}/tests").with( :ensure => 'directory', :purge => 'true', :force => 'true' @@ -82,42 +89,43 @@ describe 'augeas' do } end - case facts[:osfamily] - when 'Debian' - it { is_expected.to contain_package('libaugeas0').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => '1.2.3' - ) } - case facts[:lsbdistcodename] - when 'squeeze', 'lucid', 'precise' - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => '3.2.1', - :name => 'libaugeas-ruby1.8' + if Puppet.version < '4.0.0' + case facts[:osfamily] + when 'Debian' + it { is_expected.to contain_package('libaugeas0').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-tools').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-lenses').with( + :ensure => '1.2.3' + ) } + case facts[:lsbdistcodename] + when 'squeeze', 'lucid', 'precise' + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.8' + ) } + else + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.9.1' + ) } + end + when 'RedHat' + it { is_expected.to contain_package('augeas').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-libs').with( + :ensure => '1.2.3' ) } - else it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', - :name => 'libaugeas-ruby1.9.1' + :name => 'ruby-augeas' ) } end - when 'RedHat' - it { is_expected.to contain_package('augeas').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-libs').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => '3.2.1', - :name => 'ruby-augeas' - ) } end - end context 'with a non standard lens_dir' do -- cgit v1.2.3 From 597a2fce2f85d4ea509cddf7d59858b13446e233 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 9 Jul 2015 16:27:05 -0500 Subject: Update lens location for Puppet Enterprise The lens location for Puppet Enterprise differs from the standard location for the opensource version. We can detect if we are running the enterprise version. This commit should resolve #52. --- spec/classes/augeas_spec.rb | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'spec/classes/augeas_spec.rb') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 32a390d..b7c8273 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -7,6 +7,7 @@ describe 'augeas' do { :osfamily => 'MS-DOS', :puppetversion => Puppet.version, + :is_pe => false, } end @@ -22,6 +23,7 @@ describe 'augeas' do let(:facts) do facts.merge({ :puppetversion => Puppet.version, + :is_pe => false, }) end @@ -152,6 +154,39 @@ describe 'augeas' do :force => 'true' ).without(:recurse) } end + + context 'with Puppet Enterprise' do + let (:facts) do + facts.merge({ + :puppetversion => Puppet.version, + :is_pe => true, + }) + end + + if Puppet::Util::Package.versioncmp(Puppet.version, '4.0.0') >= 0 + # the enterprise lens dir is the same in 4 + pe_lens_dir = lens_dir + else + pe_lens_dir = '/opt/puppet/share/augeas/lenses' + end + + it { is_expected.to contain_file(pe_lens_dir).with( + :ensure => 'directory', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { is_expected.to contain_file("#{pe_lens_dir}/dist").with( + :ensure => 'directory', + :purge => 'false' + ) } + it { is_expected.to contain_file("#{pe_lens_dir}/tests").with( + :ensure => 'directory', + :force => 'true', + :purge => 'true' + ).without(:recurse) } + end + end end end -- cgit v1.2.3 From d918035d3abb026c334e090fb8ac29974e0f12d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 31 Aug 2015 16:19:02 +0200 Subject: is_pe is not defined in Puppet open-source --- spec/classes/augeas_spec.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'spec/classes/augeas_spec.rb') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index b7c8273..56870e0 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -7,7 +7,6 @@ describe 'augeas' do { :osfamily => 'MS-DOS', :puppetversion => Puppet.version, - :is_pe => false, } end @@ -23,7 +22,6 @@ describe 'augeas' do let(:facts) do facts.merge({ :puppetversion => Puppet.version, - :is_pe => false, }) end -- cgit v1.2.3 From 787d6af6b9de026ca487c352faf1187a74c3da5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 9 Sep 2015 16:54:26 +0200 Subject: Fix unit tests when using rspec-puppet-facts > 1.1.0 --- spec/classes/augeas_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'spec/classes/augeas_spec.rb') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 56870e0..5194bf2 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -40,6 +40,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' @@ -103,6 +108,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' -- cgit v1.2.3 From b7e05f3dee61d754ace620bb8a2fea508215a306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 9 Sep 2015 16:58:26 +0200 Subject: Fix unit tests when using rspec-puppet-facts > 1.1.0 --- spec/classes/augeas_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'spec/classes/augeas_spec.rb') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 5194bf2..e9fa5fc 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -50,6 +50,11 @@ describe 'augeas' do :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' @@ -118,6 +123,11 @@ describe 'augeas' do :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' -- cgit v1.2.3 From 06fe4f611a18886edea685c2ec1debc823966432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:05:55 +0200 Subject: r-p-f now sets puppetversion --- spec/classes/augeas_spec.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'spec/classes/augeas_spec.rb') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index e9fa5fc..16f76f4 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -5,8 +5,7 @@ describe 'augeas' do context 'when on an unsupported Operating System' do let (:facts) do { - :osfamily => 'MS-DOS', - :puppetversion => Puppet.version, + :osfamily => 'MS-DOS', } end @@ -20,9 +19,7 @@ describe 'augeas' do on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do - facts.merge({ - :puppetversion => Puppet.version, - }) + facts end context 'without params' do @@ -176,8 +173,7 @@ describe 'augeas' do context 'with Puppet Enterprise' do let (:facts) do facts.merge({ - :puppetversion => Puppet.version, - :is_pe => true, + :is_pe => true, }) end -- cgit v1.2.3 From 9a88fbdf3e437bf5671bbc54ebf5031af24421c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:06:22 +0200 Subject: r-p-f now sets rubyversion --- spec/classes/augeas_spec.rb | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'spec/classes/augeas_spec.rb') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 16f76f4..5ee8df4 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -37,21 +37,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' - let(:facts) do - super().merge({ - :rubyversion => '1.8.7', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' ) } else - let(:facts) do - super().merge({ - :rubyversion => '1.9.3', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' @@ -110,21 +100,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' - let(:facts) do - super().merge({ - :rubyversion => '1.8.7', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' ) } else - let(:facts) do - super().merge({ - :rubyversion => '1.9.3', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' -- cgit v1.2.3 From 205ada2c7379efd1bdfc4bd3a4d0b7bee11bcad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:09:21 +0200 Subject: Revert "r-p-f now sets rubyversion" This reverts commit 9a88fbdf3e437bf5671bbc54ebf5031af24421c0. --- spec/classes/augeas_spec.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'spec/classes/augeas_spec.rb') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 5ee8df4..16f76f4 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -37,11 +37,21 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' @@ -100,11 +110,21 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' -- cgit v1.2.3