summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authordanielsdeleo <dan@getchef.com>2014-06-12 08:35:12 -0700
committerdanielsdeleo <dan@getchef.com>2014-06-12 08:35:12 -0700
commit5c4b6bb2cb7b6d6638d07e53014b539c406a204f (patch)
tree2eae082a9ede0346c40062ba145b40c3d793d440 /spec
parent48d031610912d18b96d43f4ce40b7592083c7a66 (diff)
downloadchef-5c4b6bb2cb7b6d6638d07e53014b539c406a204f.tar.gz
Skip all unsupported platforms in remount test
Diffstat (limited to 'spec')
-rw-r--r--spec/functional/resource/mount_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/functional/resource/mount_spec.rb b/spec/functional/resource/mount_spec.rb
index caa139d029..962c02670c 100644
--- a/spec/functional/resource/mount_spec.rb
+++ b/spec/functional/resource/mount_spec.rb
@@ -164,7 +164,9 @@ describe Chef::Resource::Mount, :requires_root, :external => include_flag do
end
# don't run the remount tests on solaris2 (tmpfs does not support remount)
- describe "when the filesystem should be remounted and the resource supports remounting", :external => ohai[:platform] == "solaris2" do
+ # Need to make sure the platforms we've already excluded are considered:
+ skip_remount = include_flag || (ohai[:platform] == "solaris2")
+ describe "when the filesystem should be remounted and the resource supports remounting", :external => skip_remount do
it "should remount the filesystem if it is mounted" do
new_resource.run_action(:mount)
mount_should_exist(new_resource.mount_point, new_resource.device)