diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-29 18:40:20 -0700 |
|---|---|---|
| committer | sdelano <stephen@opscode.com> | 2017-04-28 21:50:35 -0700 |
| commit | ba32dcca3be251804cd26a44c80d44a04de0c514 (patch) | |
| tree | 3d7d9a1aad6b0bcb4d2f34833d518b2146d74fb7 | |
| parent | 2d6830a05fc9f8e098fac4f22e4c555f78c4bf1f (diff) | |
| download | chef-ba32dcca3be251804cd26a44c80d44a04de0c514.tar.gz | |
Merge pull request #5964 from chef/lcg/solaris-ruby24-fixsd/fix-solaris-tests
fix ruby-2.4 func link tests on solaris 11
Signed-off-by: Stephen Delano <stephen@chef.io>
| -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 |