From: Wilson McCoubrey Date: Thu, 16 Mar 2017 15:50:04 +0000 (+0000) Subject: (maint) Replace version comparisons unnafected by MODULES-4528 to use versioncmp X-Git-Tag: 1.9.0~10^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d34121f5578a89fd3bac926736c0e4d64c8ab0b1;p=puppet-modules%2Fpuppetlabs-firewall.git (maint) Replace version comparisons unnafected by MODULES-4528 to use versioncmp For sake of consistency --- diff --git a/spec/unit/puppet/provider/ip6tables_spec.rb b/spec/unit/puppet/provider/ip6tables_spec.rb index 058c90b..6e8b866 100644 --- a/spec/unit/puppet/provider/ip6tables_spec.rb +++ b/spec/unit/puppet/provider/ip6tables_spec.rb @@ -1,7 +1,7 @@ #!/usr/bin/env rspec require 'spec_helper' -if Puppet.version < '3.4.0' +if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0 require 'puppet/provider/confine/exists' else require 'puppet/confine/exists' diff --git a/spec/unit/puppet/provider/iptables_chain_spec.rb b/spec/unit/puppet/provider/iptables_chain_spec.rb index d8eade2..78db555 100755 --- a/spec/unit/puppet/provider/iptables_chain_spec.rb +++ b/spec/unit/puppet/provider/iptables_chain_spec.rb @@ -1,14 +1,14 @@ #!/usr/bin/env rspec require 'spec_helper' -if Puppet.version < '3.4.0' +if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0 require 'puppet/provider/confine/exists' else require 'puppet/confine/exists' end describe 'iptables chain provider detection' do - if Puppet.version < '3.4.0' + if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0 let(:exists) { Puppet::Provider::Confine::Exists } diff --git a/spec/unit/puppet/provider/iptables_spec.rb b/spec/unit/puppet/provider/iptables_spec.rb index f9316d9..d5e0082 100644 --- a/spec/unit/puppet/provider/iptables_spec.rb +++ b/spec/unit/puppet/provider/iptables_spec.rb @@ -1,14 +1,14 @@ #!/usr/bin/env rspec require 'spec_helper' -if Puppet.version < '3.4.0' +if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0 require 'puppet/provider/confine/exists' else require 'puppet/confine/exists' end describe 'iptables provider detection' do - if Puppet.version < '3.4.0' + if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0 let(:exists) { Puppet::Provider::Confine::Exists }