From: David Schmitt Date: Sun, 27 Nov 2016 16:26:20 +0000 (+0000) Subject: Update to require using stdlib 4.13 for deprecation function X-Git-Tag: 2.4.0~10^2~2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=e5d46560e4be3b5a17ce5c260f9ed1f051d731c3;p=puppet-modules%2Fpuppetlabs-apt.git Update to require using stdlib 4.13 for deprecation function --- diff --git a/.fixtures.yml b/.fixtures.yml index 578437c..0c221f0 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,6 +2,5 @@ fixtures: repositories: "stdlib": "repo": "git://github.com/puppetlabs/puppetlabs-stdlib.git" - "ref": "4.5.0" symlinks: "apt": "#{source_dir}" diff --git a/.sync.yml b/.sync.yml index bf2a881..1e54e21 100644 --- a/.sync.yml +++ b/.sync.yml @@ -4,3 +4,6 @@ docker_sets: - set: docker/ubuntu-14.04 - set: docker/debian-8 + +spec/spec_helper.rb: + allow_deprecations: true diff --git a/metadata.json b/metadata.json index d34221c..1b21a5c 100644 --- a/metadata.json +++ b/metadata.json @@ -8,7 +8,7 @@ "project_page": "https://github.com/puppetlabs/puppetlabs-apt", "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", "dependencies": [ - {"name":"puppetlabs/stdlib","version_requirement":">= 4.5.0 < 5.0.0"} + {"name":"puppetlabs/stdlib","version_requirement":">= 4.13.0 < 5.0.0"} ], "operatingsystem_support": [ { diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb index a326bdb..319074b 100644 --- a/spec/defines/setting_spec.rb +++ b/spec/defines/setting_spec.rb @@ -95,9 +95,7 @@ describe 'apt::setting' do context 'with priority=1.2' do let(:params) { default_params.merge({ :priority => 1.2 }) } - it do - expect { subject.call }.to raise_error(Puppet::Error, /be an integer /) - end + it { is_expected.to compile.and_raise_error(/input needs to be a String/) } end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9ae37b1..22d5d68 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,14 +1,6 @@ #This file is generated by ModuleSync, do not edit. require 'puppetlabs_spec_helper/module_spec_helper' -if Puppet.version.to_f >= 4.5 - RSpec.configure do |c| - c.before :each do - Puppet.settings[:strict] = :error - end - end -end - # put local configuration and setup into spec_helper_local begin require 'spec_helper_local' diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index a5ce06f..3f87bd1 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -44,7 +44,7 @@ RSpec.configure do |c| hosts.each do |host| copy_module_to(host, :source => proj_root, :module_name => 'apt') shell("/bin/touch #{default['puppetpath']}/hiera.yaml") - on host, puppet('module install puppetlabs-stdlib --version 4.5.0'), { :acceptable_exit_codes => [0,1] } + on host, puppet('module install puppetlabs-stdlib --version 4.13.1') end end end