From 2791a33ce95a64a2c72dd124aa3c873a7a19219c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 30 Apr 2014 09:31:01 +0200 Subject: Fix unit tests --- spec/defines/augeas_lens_spec.rb | 19 ++++++++++++----- spec/hosts/simple_debian_squeeze_spec.rb | 36 +++++++++++++++++++++++++++----- spec/hosts/simple_debian_wheezy_spec.rb | 28 ++++++++++++++++++------- spec/hosts/simple_redhat_spec.rb | 21 +++++++++++++++++-- spec/hosts/with_lens_spec.rb | 5 +++++ spec/hosts/wrong_os_spec.rb | 6 +++++- 6 files changed, 95 insertions(+), 20 deletions(-) (limited to 'spec') diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 57d30b6..8b57b3f 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -3,7 +3,10 @@ require 'spec_helper' describe 'augeas::lens' do let (:title) { 'foo' } let (:facts) { { - :osfamily => 'RedHat', + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'RedHat', } } context 'when no lens_source is passed' do it 'should error' do @@ -43,8 +46,11 @@ describe 'augeas::lens' do } } let (:facts) { { - :osfamily => 'RedHat', - :augeasversion => '1.0.0', + :augeas_lens_dir => :undef, + :augeas_version => :undef, + :augeasversion => '1.0.0', + :augeas_ruby_version => :undef, + :osfamily => 'RedHat', } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -58,8 +64,11 @@ describe 'augeas::lens' do } } let (:facts) { { - :osfamily => 'RedHat', - :augeasversion => '1.5.0', + :augeas_lens_dir => :undef, + :augeas_version => :undef, + :augeasversion => '1.5.0', + :augeas_ruby_version => :undef, + :osfamily => 'RedHat', } } it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } diff --git a/spec/hosts/simple_debian_squeeze_spec.rb b/spec/hosts/simple_debian_squeeze_spec.rb index 4b41105..08ecd3e 100644 --- a/spec/hosts/simple_debian_squeeze_spec.rb +++ b/spec/hosts/simple_debian_squeeze_spec.rb @@ -2,11 +2,23 @@ require 'spec_helper' describe 'simple_debian_squeeze' do let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'squeeze', + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'squeeze', + :osfamily => 'Debian', } } context 'when versions are not specified' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_version => :undef, + :augeas_ruby_version => :undef, + :lsbdistcodename => 'squeeze', + :osfamily => 'Debian', + :rubyversion => '1.8.7', + } } + it { should contain_package('libaugeas0').with( :ensure => 'present' ) } @@ -26,8 +38,10 @@ describe 'simple_debian_squeeze' do let (:facts) { { :osfamily => 'Debian', :lsbdistcodename => 'squeeze', + :augeas_lens_dir => :undef, :augeas_version => '1.2.3', :augeas_ruby_version => '3.2.1', + :rubyversion => '1.8.7', } } it { should contain_package('libaugeas0').with( @@ -46,6 +60,15 @@ describe 'simple_debian_squeeze' do end context 'with standard lens_dir' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'squeeze', + :osfamily => 'Debian', + :rubyversion => '1.8.7', + } } + it { should contain_file('/usr/share/augeas/lenses').with( :ensure => 'directory', :purge => 'true', @@ -66,9 +89,12 @@ describe 'simple_debian_squeeze' do context 'with a non standard lens_dir' do let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'squeeze', - :augeas_lens_dir => '/opt/augeas/lenses' + :augeas_lens_dir => '/opt/augeas/lenses', + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'squeeze', + :osfamily => 'Debian', + :rubyversion => '1.8.7', } } it { should contain_file('/opt/augeas/lenses').with( diff --git a/spec/hosts/simple_debian_wheezy_spec.rb b/spec/hosts/simple_debian_wheezy_spec.rb index 8985e28..f301038 100644 --- a/spec/hosts/simple_debian_wheezy_spec.rb +++ b/spec/hosts/simple_debian_wheezy_spec.rb @@ -2,9 +2,12 @@ require 'spec_helper' describe 'simple_debian_wheezy' do let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'wheezy', - :rubyversion => '1.9.1', + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'wheezy', + :osfamily => 'Debian', + :rubyversion => '1.9.1', } } context 'when versions are not specified' do @@ -28,6 +31,7 @@ describe 'simple_debian_wheezy' do :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :rubyversion => '1.9.1', + :augeas_lens_dir => :undef, :augeas_version => '1.2.3', :augeas_ruby_version => '3.2.1', } } @@ -48,6 +52,14 @@ describe 'simple_debian_wheezy' do end context 'with standard lens_dir' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'Debian', + :rubyversion => '1.9.1', + } } + it { should contain_file('/usr/share/augeas/lenses').with( :ensure => 'directory', :purge => 'true', @@ -68,10 +80,12 @@ describe 'simple_debian_wheezy' do context 'with a non standard lens_dir' do let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'wheezy', - :rubyversion => '1.9.1', - :augeas_lens_dir => '/opt/augeas/lenses' + :augeas_lens_dir => '/opt/augeas/lenses', + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'wheezy', + :osfamily => 'Debian', + :rubyversion => '1.9.1', } } it { should contain_file('/opt/augeas/lenses').with( diff --git a/spec/hosts/simple_redhat_spec.rb b/spec/hosts/simple_redhat_spec.rb index 5045377..a7acd1f 100644 --- a/spec/hosts/simple_redhat_spec.rb +++ b/spec/hosts/simple_redhat_spec.rb @@ -6,6 +6,13 @@ describe 'simple_redhat' do } } context 'when versions are not specified' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'RedHat', + } } + it { should contain_package('augeas').with( :ensure => 'present' ) } @@ -21,6 +28,7 @@ describe 'simple_redhat' do context 'when versions are specified' do let (:facts) { { :osfamily => 'RedHat', + :augeas_lens_dir => :undef, :augeas_version => '1.2.3', :augeas_ruby_version => '3.2.1', } } @@ -38,6 +46,13 @@ describe 'simple_redhat' do end context 'with standard lens_dir' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'RedHat', + } } + it { should contain_file('/usr/share/augeas/lenses').with( :ensure => 'directory', :purge => 'true', @@ -58,8 +73,10 @@ describe 'simple_redhat' do context 'with a non standard lens_dir' do let (:facts) { { - :osfamily => 'RedHat', - :augeas_lens_dir => '/opt/augeas/lenses' + :augeas_lens_dir => '/opt/augeas/lenses', + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'RedHat', } } it { should contain_file('/opt/augeas/lenses').with( diff --git a/spec/hosts/with_lens_spec.rb b/spec/hosts/with_lens_spec.rb index d7a5249..35ab8b6 100644 --- a/spec/hosts/with_lens_spec.rb +++ b/spec/hosts/with_lens_spec.rb @@ -9,6 +9,8 @@ describe 'with_lens' do let (:facts) { { :osfamily => 'RedHat', :augeas_lens_source => '/tmp/foo.aug', + :augeas_stock_since => :undef, + :augeas_test_source => :undef, } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -22,6 +24,7 @@ describe 'with_lens' do :osfamily => 'RedHat', :augeas_lens_source => '/tmp/foo.aug', :augeas_test_source => '/tmp/test_foo.aug', + :augeas_stock_since => :undef, } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -36,6 +39,7 @@ describe 'with_lens' do :augeas_lens_source => '/tmp/foo.aug', :augeas_stock_since => '1.2.3', :augeasversion => '1.0.0', + :augeas_test_source => :undef, } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -48,6 +52,7 @@ describe 'with_lens' do :augeas_lens_source => '/tmp/foo.aug', :augeas_stock_since => '1.2.3', :augeasversion => '1.5.0', + :augeas_test_source => :undef, } } it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } diff --git a/spec/hosts/wrong_os_spec.rb b/spec/hosts/wrong_os_spec.rb index 5704ded..4180e81 100644 --- a/spec/hosts/wrong_os_spec.rb +++ b/spec/hosts/wrong_os_spec.rb @@ -2,7 +2,11 @@ require 'spec_helper' describe 'wrong_os' do let (:facts) { { - :osfamily => 'MS-DOS' + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_test_source => :undef, + :augeas_version => :undef, + :osfamily => 'MS-DOS', } } it 'should fail' do -- cgit v1.2.3