Merge pull request #3086 from chef/ksubrama/test_fix

Fix faulty umask logic used in spec tests.

8 files changed, 12 insertions, 12 deletions

diff --git a/spec/functional/file_content_management/deploy_strategies_spec.rb b/spec/functional/file_content_management/deploy_strategies_spec.rb
index 03a6c504c1..8a995d0e41 100644
--- a/spec/functional/file_content_management/deploy_strategies_spec.rb
+++ b/spec/functional/file_content_management/deploy_strategies_spec.rb
@@ -43,7 +43,7 @@ shared_examples_for "a content deploy strategy" do
 
     ##
     # UNIX Context
-    let(:default_mode) { normalize_mode(0100666 - File.umask) }
+    let(:default_mode) { normalize_mode(0666 & ~File.umask) }
 
     it "touches the file to create it (UNIX)", :unix_only do
       content_deployer.create(target_file_path)
diff --git a/spec/functional/resource/cookbook_file_spec.rb b/spec/functional/resource/cookbook_file_spec.rb
index 7797ed0041..6d4c5b4a8f 100644
--- a/spec/functional/resource/cookbook_file_spec.rb
+++ b/spec/functional/resource/cookbook_file_spec.rb
@@ -32,7 +32,7 @@ describe Chef::Resource::CookbookFile do
     content
   end
 
-  let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
+  let(:default_mode) { (0666 & ~File.umask).to_s(8) }
 
   it_behaves_like "a securable resource with reporting"
 
diff --git a/spec/functional/resource/directory_spec.rb b/spec/functional/resource/directory_spec.rb
index 2c4025f83e..88a810964f 100644
--- a/spec/functional/resource/directory_spec.rb
+++ b/spec/functional/resource/directory_spec.rb
@@ -23,7 +23,7 @@ describe Chef::Resource::Directory do
 
   let(:directory_base) { "directory_spec" }
 
-  let(:default_mode) { ((0100777 - File.umask) & 07777).to_s(8) }
+  let(:default_mode) { (0777 & ~File.umask).to_s(8) }
 
   def create_resource
     events = Chef::EventDispatch::Dispatcher.new
diff --git a/spec/functional/resource/file_spec.rb b/spec/functional/resource/file_spec.rb
index cf70c349fb..f1a290dea4 100644
--- a/spec/functional/resource/file_spec.rb
+++ b/spec/functional/resource/file_spec.rb
@@ -64,7 +64,7 @@ describe Chef::Resource::File do
     provider.current_resource
   end
 
-  let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
+  let(:default_mode) { (0666 & ~File.umask).to_s(8) }
 
   it_behaves_like "a file resource"
 
diff --git a/spec/functional/resource/remote_directory_spec.rb b/spec/functional/resource/remote_directory_spec.rb
index bcafca7399..37ffbbc971 100644
--- a/spec/functional/resource/remote_directory_spec.rb
+++ b/spec/functional/resource/remote_directory_spec.rb
@@ -22,7 +22,7 @@ describe Chef::Resource::RemoteDirectory do
   include_context Chef::Resource::Directory
 
   let(:directory_base) { "directory_spec" }
-  let(:default_mode) { ((0100777 - File.umask) & 07777).to_s(8) }
+  let(:default_mode) { (0777 & ~File.umask).to_s(8) }
 
   def create_resource
     cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, "cookbooks"))
diff --git a/spec/functional/resource/remote_file_spec.rb b/spec/functional/resource/remote_file_spec.rb
index 29091fd785..4fbcd2d24b 100644
--- a/spec/functional/resource/remote_file_spec.rb
+++ b/spec/functional/resource/remote_file_spec.rb
@@ -52,7 +52,7 @@ describe Chef::Resource::RemoteFile do
     create_resource
   end
 
-  let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
+  let(:default_mode) { (0666 & ~File.umask).to_s(8) }
 
   context "when fetching files over HTTP" do
     before(:all) do
diff --git a/spec/functional/resource/template_spec.rb b/spec/functional/resource/template_spec.rb
index d7b35e7450..35c5166e31 100644
--- a/spec/functional/resource/template_spec.rb
+++ b/spec/functional/resource/template_spec.rb
@@ -58,7 +58,7 @@ describe Chef::Resource::Template do
     create_resource
   end
 
-  let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
+  let(:default_mode) { (0666 & ~File.umask).to_s(8) }
 
   it_behaves_like "a file resource"
 
diff --git a/spec/support/shared/functional/securable_resource_with_reporting.rb b/spec/support/shared/functional/securable_resource_with_reporting.rb
index 8a2ceed837..37fc538801 100644
--- a/spec/support/shared/functional/securable_resource_with_reporting.rb
+++ b/spec/support/shared/functional/securable_resource_with_reporting.rb
@@ -35,7 +35,7 @@ shared_examples_for "a securable resource with reporting" do
   # Default mode varies based on implementation. Providers that use a tempfile
   # will default to 0600. Providers that use File.open will default to 0666 -
   # umask
-  # let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
+  # let(:default_mode) { (0666 & ~File.umask).to_s(8) }
 
   describe "reading file security metadata for reporting on unix", :unix_only => true do
     # According to POSIX standard created files get either the
@@ -185,7 +185,7 @@ shared_examples_for "a securable resource with reporting" do
           # TODO: most stable way to specify?
           expect(current_resource.owner).to eq(Etc.getpwuid(Process.uid).name)
           expect(current_resource.group).to eq(@expected_group_name)
-          expect(current_resource.mode).to eq("0#{((0100666 - File.umask) & 07777).to_s(8)}")
+          expect(current_resource.mode).to eq("0#{(0666 & ~File.umask).to_s(8)}")
         end
       end
 
@@ -239,8 +239,8 @@ shared_examples_for "a securable resource with reporting" do
       end
 
       context "and mode is specified as a String" do
-        let(:default_create_mode) { (0100666 - File.umask) }
-        let(:expected_mode) { "0#{(default_create_mode & 07777).to_s(8)}" }
+        let(:default_create_mode) { 0666 & ~File.umask }
+        let(:expected_mode) { "0#{default_create_mode.to_s(8)}" }
 
         before do
           resource.mode(expected_mode)
@@ -252,7 +252,7 @@ shared_examples_for "a securable resource with reporting" do
       end
 
       context "and mode is specified as an Integer" do
-        let(:set_mode) { (0100666 - File.umask) & 07777 }
+        let(:set_mode) { 0666 & ~File.umask }
         let(:expected_mode) { "0#{set_mode.to_s(8)}" }
 
         before do