RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Updated travisci file to remove allow_failures on Puppet 4

Browse Source
This commit is contained in:
Jonathan Tripathy
2015-06-04 14:27:08 +01:00
parent 0f194c7bb3
commit 232258f290
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -20,8 +20,5 @@ matrix:
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 1.8.7 - rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" 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: notifications:
email: false email: false

2
spec/unit/facter/java_version_spec.rb
View File

@@ -57,7 +57,7 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
end end
let(:facts) { {:operatingsystem => 'MyOS'} } let(:facts) { {:operatingsystem => 'MyOS'} }
it do 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 Facter.value(:java_version).should be_nil
end end
end end