From 232258f2904655acb5f1b0219f4708efe233c857 Mon Sep 17 00:00:00 2001 From: Jonathan Tripathy Date: Thu, 4 Jun 2015 14:27:08 +0100 Subject: [PATCH] Updated travisci file to remove allow_failures on Puppet 4 --- .travis.yml | 3 --- spec/unit/facter/java_version_spec.rb | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbf6f11..7e8ed57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,5 @@ matrix: env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" - allow_failures: - - rvm: 2.1.6 - env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" notifications: email: false diff --git a/spec/unit/facter/java_version_spec.rb b/spec/unit/facter/java_version_spec.rb index 516f71e..c5f5ec8 100644 --- a/spec/unit/facter/java_version_spec.rb +++ b/spec/unit/facter/java_version_spec.rb @@ -57,7 +57,7 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode) end let(:facts) { {:operatingsystem => 'MyOS'} } it do - Facter::Util::Resolution.expects(:which).with("java").returns(false) + Facter::Util::Resolution.expects(:which).at_least(1).with("java").returns(false) Facter.value(:java_version).should be_nil end end