diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-29 18:40:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-29 18:40:20 -0700 |
commit | 0430f7735f33492849364eb22953bde52a527b66 (patch) | |
tree | 6ce3403feb0599d2e66bd6bc20e7717db1774716 | |
parent | d4162533c1c6015ac7e368f1751287df5d3b70a5 (diff) | |
parent | 393cd2822d44fbcaad9cbeffd1dd63c70f8fd938 (diff) | |
download | chef-0430f7735f33492849364eb22953bde52a527b66.tar.gz |
Merge pull request #5964 from chef/lcg/solaris-ruby24-fix
fix ruby-2.4 func link tests on solaris 11
-rw-r--r-- | spec/functional/resource/link_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/functional/resource/link_spec.rb b/spec/functional/resource/link_spec.rb index 256f350640..e8a95436f7 100644 --- a/spec/functional/resource/link_spec.rb +++ b/spec/functional/resource/link_spec.rb @@ -1,6 +1,6 @@ # # Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2011-2016, Chef Software Inc. +# Copyright:: Copyright 2011-2017, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -654,7 +654,7 @@ describe Chef::Resource::Link do end context "and the link does not yet exist" do it "links to the target file" do - skip("OS X/FreeBSD/AIX symlink? and readlink working on hard links to symlinks") if os_x? || freebsd? || aix? + skip("OS X/FreeBSD/AIX/Solaris symlink? and readlink working on hard links to symlinks") if os_x? || freebsd? || aix? || solaris? resource.run_action(:create) expect(File.exists?(target_file)).to be_truthy # OS X gets angry about this sort of link. Bug in OS X, IMO. @@ -673,7 +673,7 @@ describe Chef::Resource::Link do end context "and the link does not yet exist" do it "links to the target file" do - skip("OS X/FreeBSD/AIX fails to create hardlinks to broken symlinks") if os_x? || freebsd? || aix? + skip("OS X/FreeBSD/AIX/Solaris fails to create hardlinks to broken symlinks") if os_x? || freebsd? || aix? || solaris? resource.run_action(:create) expect(File.exists?(target_file) || File.symlink?(target_file)).to be_truthy expect(symlink?(target_file)).to be_truthy |