From 7aa4c2a9e3107cc108448680d26b29ba63657b48 Mon Sep 17 00:00:00 2001 From: Joseph Yaworski Date: Sun, 20 Mar 2016 18:38:07 -0400 Subject: Update from voxpupuli modulesync_config --- spec/acceptance/nodesets/centos-511-x64.yml | 9 + spec/acceptance/nodesets/centos-66-x64-pe.yml | 11 ++ spec/acceptance/nodesets/centos-66-x64.yml | 9 + spec/acceptance/nodesets/centos-72-x64.yml | 9 + spec/acceptance/nodesets/debian-78-x64.yml | 9 + spec/acceptance/nodesets/debian-82-x64.yml | 9 + .../acceptance/nodesets/ubuntu-server-1204-x64.yml | 9 + .../acceptance/nodesets/ubuntu-server-1404-x64.yml | 8 +- spec/classes/coverage_spec.rb | 3 + spec/classes/unattended_upgrades_spec.rb | 220 ++++++++++----------- spec/spec_helper.rb | 2 + 11 files changed, 183 insertions(+), 115 deletions(-) create mode 100644 spec/acceptance/nodesets/centos-511-x64.yml create mode 100644 spec/acceptance/nodesets/centos-66-x64-pe.yml create mode 100644 spec/acceptance/nodesets/centos-66-x64.yml create mode 100644 spec/acceptance/nodesets/centos-72-x64.yml create mode 100644 spec/acceptance/nodesets/debian-78-x64.yml create mode 100644 spec/acceptance/nodesets/debian-82-x64.yml create mode 100644 spec/acceptance/nodesets/ubuntu-server-1204-x64.yml create mode 100644 spec/classes/coverage_spec.rb (limited to 'spec') diff --git a/spec/acceptance/nodesets/centos-511-x64.yml b/spec/acceptance/nodesets/centos-511-x64.yml new file mode 100644 index 0000000..ca14463 --- /dev/null +++ b/spec/acceptance/nodesets/centos-511-x64.yml @@ -0,0 +1,9 @@ +HOSTS: + centos-511-x64: + roles: + - master + platform: el-5-x86_64 + box: puppetlabs/centos-5.11-64-nocm + hypervisor: vagrant +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/centos-66-x64-pe.yml b/spec/acceptance/nodesets/centos-66-x64-pe.yml new file mode 100644 index 0000000..9a93037 --- /dev/null +++ b/spec/acceptance/nodesets/centos-66-x64-pe.yml @@ -0,0 +1,11 @@ +HOSTS: + centos-66-x64: + roles: + - master + - database + - dashboard + platform: el-6-x86_64 + box: puppetlabs/centos-6.6-64-puppet-enterprise + hypervisor: vagrant +CONFIG: + type: pe diff --git a/spec/acceptance/nodesets/centos-66-x64.yml b/spec/acceptance/nodesets/centos-66-x64.yml new file mode 100644 index 0000000..214318a --- /dev/null +++ b/spec/acceptance/nodesets/centos-66-x64.yml @@ -0,0 +1,9 @@ +HOSTS: + centos-66-x64: + roles: + - master + platform: el-6-x86_64 + box: puppetlabs/centos-6.6-64-nocm + hypervisor: vagrant +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/centos-72-x64.yml b/spec/acceptance/nodesets/centos-72-x64.yml new file mode 100644 index 0000000..2c628fc --- /dev/null +++ b/spec/acceptance/nodesets/centos-72-x64.yml @@ -0,0 +1,9 @@ +HOSTS: + centos-72-x64: + roles: + - master + platform: el-7-x86_64 + box: puppetlabs/centos-7.2-64-nocm + hypervisor: vagrant +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/debian-78-x64.yml b/spec/acceptance/nodesets/debian-78-x64.yml new file mode 100644 index 0000000..2baa693 --- /dev/null +++ b/spec/acceptance/nodesets/debian-78-x64.yml @@ -0,0 +1,9 @@ +HOSTS: + debian-78-x64: + roles: + - master + platform: debian-7-amd64 + box: puppetlabs/debian-7.8-64-nocm + hypervisor: vagrant +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/debian-82-x64.yml b/spec/acceptance/nodesets/debian-82-x64.yml new file mode 100644 index 0000000..f496f12 --- /dev/null +++ b/spec/acceptance/nodesets/debian-82-x64.yml @@ -0,0 +1,9 @@ +HOSTS: + debian-82-x64: + roles: + - master + platform: debian-8-amd64 + box: puppetlabs/debian-8.2-64-nocm + hypervisor: vagrant +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml new file mode 100644 index 0000000..fa94e2c --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml @@ -0,0 +1,9 @@ +HOSTS: + ubuntu-server-1204-x64: + roles: + - master + platform: ubuntu-12.04-amd64 + box: puppetlabs/ubuntu-12.04-64-nocm + hypervisor: vagrant +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml index cba1cd0..72ba9c2 100644 --- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml +++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml @@ -3,9 +3,7 @@ HOSTS: roles: - master platform: ubuntu-14.04-amd64 - box : puppetlabs/ubuntu-14.04-64-nocm - box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm - hypervisor : vagrant + box: puppetlabs/ubuntu-14.04-64-nocm + hypervisor: vagrant CONFIG: - log_level : debug - type: git + type: foss diff --git a/spec/classes/coverage_spec.rb b/spec/classes/coverage_spec.rb new file mode 100644 index 0000000..c083569 --- /dev/null +++ b/spec/classes/coverage_spec.rb @@ -0,0 +1,3 @@ +require 'rspec-puppet' + +at_exit { RSpec::Puppet::Coverage.report! } diff --git a/spec/classes/unattended_upgrades_spec.rb b/spec/classes/unattended_upgrades_spec.rb index 5943f02..dc2137f 100644 --- a/spec/classes/unattended_upgrades_spec.rb +++ b/spec/classes/unattended_upgrades_spec.rb @@ -4,10 +4,10 @@ describe 'unattended_upgrades' do let(:file_unattended) { '/etc/apt/apt.conf.d/50unattended-upgrades' } let(:file_periodic) { '/etc/apt/apt.conf.d/10periodic' } let(:facts) { { - :osfamily => 'Debian', - :lsbdistid => 'Debian', - :lsbdistcodename => 'wheezy', - :lsbrelease => '7.0.3', + osfamily: 'Debian', + lsbdistid: 'Debian', + lsbdistcodename: 'wheezy', + lsbrelease: '7.0.3', } } let(:pre_condition) { 'include ::apt' @@ -18,23 +18,23 @@ describe 'unattended_upgrades' do it { should contain_apt__conf('unattended-upgrades').with( - :require => 'Package[unattended-upgrades]', - :notify_update => false, + require: 'Package[unattended-upgrades]', + notify_update: false, ) } it { should contain_apt__conf('periodic').with( - :require => 'Package[unattended-upgrades]', - :notify_update => false, + require: 'Package[unattended-upgrades]', + notify_update: false, ) } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( /Unattended-Upgrade::Origins-Pattern {/ ).with_content( @@ -60,9 +60,9 @@ describe 'unattended_upgrades' do it { should create_file(file_periodic).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( /APT::Periodic::Enable "1";/ ).with_content( @@ -91,23 +91,23 @@ describe 'unattended_upgrades' do } it { should contain_apt__conf('auto-upgrades').with( - :ensure => 'absent', + ensure: 'absent', ) } end context 'with defaults on Debian 6 Squeeze' do let(:facts) { { - :osfamily => 'Debian', - :lsbdistid => 'Debian', - :lsbdistcodename => 'squeeze', - :lsbdistrelease => '6.0.10', + osfamily: 'Debian', + lsbdistid: 'Debian', + lsbdistcodename: 'squeeze', + lsbdistrelease: '6.0.10', } } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( # This section varies for different releases /\Unattended-Upgrade::Allowed-Origins\ {\n @@ -121,16 +121,16 @@ describe 'unattended_upgrades' do context 'with defaults on Debian 7 Wheezy' do let(:facts) { { - :osfamily => 'Debian', - :lsbdistid => 'Debian', - :lsbdistcodename => 'wheezy', - :lsbdistrelease => '7.1', + osfamily: 'Debian', + lsbdistid: 'Debian', + lsbdistcodename: 'wheezy', + lsbdistrelease: '7.1', } } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( # This section varies for different releases /\Unattended-Upgrade::Origins-Pattern\ {\n @@ -143,16 +143,16 @@ describe 'unattended_upgrades' do context 'with defaults on Debian 8 Jessie' do let(:facts) { { - :osfamily => 'Debian', - :lsbdistid => 'Debian', - :lsbdistcodename => 'jessie', - :lsbdistrelease => '8.2', + osfamily: 'Debian', + lsbdistid: 'Debian', + lsbdistcodename: 'jessie', + lsbdistrelease: '8.2', } } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( # This section varies for different releases /\Unattended-Upgrade::Origins-Pattern\ {\n @@ -164,16 +164,16 @@ describe 'unattended_upgrades' do context 'with defaults on Ubuntu 12.04LTS Precise Pangolin' do let(:facts) { { - :osfamily => 'Debian', - :lsbdistid => 'Ubuntu', - :lsbdistcodename => 'precise', - :lsbrelease => '12.04', + osfamily: 'Debian', + lsbdistid: 'Ubuntu', + lsbdistcodename: 'precise', + lsbrelease: '12.04', } } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( # This is the only section that's different for Ubuntu compared to Debian /\Unattended-Upgrade::Allowed-Origins\ {\n @@ -185,16 +185,16 @@ describe 'unattended_upgrades' do context 'with defaults on Ubuntu 14.04LTS Trusty Tahr' do let(:facts) { { - :osfamily => 'Debian', - :lsbdistid => 'Ubuntu', - :lsbdistcodename => 'trusty', - :lsbrelease => '14.04', + osfamily: 'Debian', + lsbdistid: 'Ubuntu', + lsbdistcodename: 'trusty', + lsbrelease: '14.04', } } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( # This is the only section that's different for Ubuntu compared to Debian /\Unattended-Upgrade::Allowed-Origins\ {\n @@ -206,16 +206,16 @@ describe 'unattended_upgrades' do context 'with defaults on Ubuntu 15.04 Vivid Vervet' do let(:facts) { { - :osfamily => 'Debian', - :lsbdistid => 'Ubuntu', - :lsbdistcodename => 'vivid', - :lsbrelease => '15.04', + osfamily: 'Debian', + lsbdistid: 'Ubuntu', + lsbdistcodename: 'vivid', + lsbrelease: '15.04', } } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( # This is the only section that's different for Ubuntu compared to Debian /\Unattended-Upgrade::Allowed-Origins\ {\n @@ -227,16 +227,16 @@ describe 'unattended_upgrades' do context 'with defaults on Ubuntu 15.10 Wily Werewolf' do let(:facts) { { - :osfamily => 'Debian', - :lsbdistid => 'Ubuntu', - :lsbdistcodename => 'wily', - :lsbrelease => '15.10', + osfamily: 'Debian', + lsbdistid: 'Ubuntu', + lsbdistcodename: 'wily', + lsbrelease: '15.10', } } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( # This is the only section that's different for Ubuntu compared to Debian /\Unattended-Upgrade::Allowed-Origins\ {\n @@ -248,16 +248,16 @@ describe 'unattended_upgrades' do context 'with defaults on Raspbian' do let(:facts) { { - :osfamily => 'Debian', - :lsbdistid => 'Raspbian', - :lsbdistcodename => 'jessie', - :lsbrelease => '8.0', + osfamily: 'Debian', + lsbdistid: 'Raspbian', + lsbdistcodename: 'jessie', + lsbrelease: '8.0', } } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ) } end @@ -265,54 +265,54 @@ describe 'unattended_upgrades' do context 'set all the things' do let :params do { - :age => { 'min' => 1, 'max' => 20 }, - :size => 1000, - :update => 5, - :upgradeable_packages => { + age: { 'min' => 1, 'max' => 20 }, + size: 1000, + update: 5, + upgradeable_packages: { 'download_only' => 5, 'debdelta' => 5, }, - :upgrade => 5, - :auto => { + upgrade: 5, + auto: { 'clean' => '5', 'fix_interrupted_dpkg' => false, 'remove' => false, 'reboot' => true, }, - :verbose => 1, - :legacy_origin => true, - :origins => %w(bananas), - :blacklist => %w(foo bar), - :minimal_steps => false, - :install_on_shutdown => true, - :mail => { + verbose: 1, + legacy_origin: true, + origins: %w(bananas), + blacklist: %w(foo bar), + minimal_steps: false, + install_on_shutdown: true, + mail: { 'to' => 'root@localhost', 'only_on_error' => true, }, - :dl_limit => 70, - :random_sleep => 300, - :notify_update => true, + dl_limit: 70, + random_sleep: 300, + notify_update: true, } end it { should contain_package('unattended-upgrades') } it { should contain_apt__conf('unattended-upgrades').with( - :require => 'Package[unattended-upgrades]', - :notify_update => true, + require: 'Package[unattended-upgrades]', + notify_update: true, ) } it { should contain_apt__conf('periodic').with( - :require => 'Package[unattended-upgrades]', - :notify_update => true, + require: 'Package[unattended-upgrades]', + notify_update: true, ) } it { should create_file(file_unattended).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( /Unattended-Upgrade::Allowed-Origins {\n\t"bananas";\n};/ ).with_content( @@ -338,9 +338,9 @@ describe 'unattended_upgrades' do it { should create_file(file_periodic).with( - :owner => 'root', - :group => 'root', - :mode => '0644', + owner: 'root', + group: 'root', + mode: '0644', ).with_content( /APT::Periodic::Enable "1";/ ).with_content( @@ -372,7 +372,7 @@ describe 'unattended_upgrades' do it { should contain_apt__conf('auto-upgrades').with( - :ensure => 'absent', + ensure: 'absent', ) } end @@ -381,7 +381,7 @@ describe 'unattended_upgrades' do context 'bad install_on_shutdown' do let :params do { - :install_on_shutdown => 'foo', + install_on_shutdown: 'foo', } end it do @@ -393,7 +393,7 @@ describe 'unattended_upgrades' do context 'bad legacy_origin' do let :params do { - :legacy_origin => 'foo', + legacy_origin: 'foo', } end it do @@ -405,7 +405,7 @@ describe 'unattended_upgrades' do context 'bad minimal_steps' do let :params do { - :minimal_steps => 'foo', + minimal_steps: 'foo', } end it do @@ -417,7 +417,7 @@ describe 'unattended_upgrades' do context 'bad blacklist' do let :params do { - :blacklist => 'foo', + blacklist: 'foo', } end it do @@ -429,7 +429,7 @@ describe 'unattended_upgrades' do context 'bad origins' do let :params do { - :origins => 'foo', + origins: 'foo', } end it do @@ -441,7 +441,7 @@ describe 'unattended_upgrades' do context 'bad auto' do let :params do { - :auto => 'foo', + auto: 'foo', } end it do @@ -453,7 +453,7 @@ describe 'unattended_upgrades' do context 'bad mail' do let :params do { - :mail => 'foo', + mail: 'foo', } end it do @@ -465,7 +465,7 @@ describe 'unattended_upgrades' do context 'bad backup' do let :params do { - :backup => 'foo', + backup: 'foo', } end it do @@ -477,7 +477,7 @@ describe 'unattended_upgrades' do context 'bad age' do let :params do { - :age => 'foo', + age: 'foo', } end it do @@ -489,7 +489,7 @@ describe 'unattended_upgrades' do context 'bad size' do let :params do { - :size => 'foo', + size: 'foo', } end it do @@ -501,7 +501,7 @@ describe 'unattended_upgrades' do context 'bad upgradeable_packages' do let :params do { - :upgradeable_packages => 'foo', + upgradeable_packages: 'foo', } end it do @@ -513,7 +513,7 @@ describe 'unattended_upgrades' do context 'bad mail[\'only_on_error\']' do let :params do { - :mail => { 'only_on_error' => 'foo' }, + mail: { 'only_on_error' => 'foo' }, } end it do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2c6f566..1ffdf17 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1 +1,3 @@ require 'puppetlabs_spec_helper/module_spec_helper' +require 'rspec-puppet-facts' +include RspecPuppetFacts -- cgit v1.2.3