opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #493 from DavidS/fixup-acceptance-testing

Browse source 
(maint) use puppet's utility function instead of API that's not avail…
This commit is contained in:
TP Honey 2015-07-30 11:12:01 +01:00
commit 956c329a8a
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
spec/spec_helper_acceptance.rb
View file

@ -1,7 +1,6 @@
#! /usr/bin/env ruby -S rspec #! /usr/bin/env ruby -S rspec
require 'beaker-rspec' require 'beaker-rspec'
require 'beaker/puppet_install_helper' require 'beaker/puppet_install_helper'
require 'rubygems'
UNSUPPORTED_PLATFORMS = [] UNSUPPORTED_PLATFORMS = []
@ -37,7 +36,7 @@ end
RSpec.shared_context "with faked facts" do RSpec.shared_context "with faked facts" do
let(:facts_d) do let(:facts_d) do
puppet_version = (on default, puppet('--version')).output.chomp puppet_version = (on default, puppet('--version')).output.chomp
if Gem::Version(puppet_version) < Gem::Version('4.0.0') && fact('is_pe', '--puppet') == "true" if Puppet::Util::Package.versioncmp(puppet_version, '4.0.0') < 0 && fact('is_pe', '--puppet') == "true"
if fact('osfamily') =~ /windows/i if fact('osfamily') =~ /windows/i
if fact('kernelmajversion').to_f < 6.0 if fact('kernelmajversion').to_f < 6.0
'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d' 'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'