chef 12.6.0-universal-mingw32 → 12.7.2-universal-mingw32

data/spec/functional/resource/remote_directory_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::RemoteDirectory do
   include_context Chef::Resource::Directory
@@ -36,14 +36,14 @@ describe Chef::Resource::RemoteDirectory do
 
     resource = Chef::Resource::RemoteDirectory.new(path, run_context)
     resource.source "remotedir"
-    resource.cookbook('openldap')
+    resource.cookbook("openldap")
     resource
   end
 
   def create_extraneous_files
-    FileUtils.mkdir_p(File.join(path, 'remotesubdir'))
-    @existing1 = File.join(path, 'marked_for_death.txt')
-    @existing2 = File.join(path, 'remotesubdir', 'marked_for_death_again.txt')
+    FileUtils.mkdir_p(File.join(path, "remotesubdir"))
+    @existing1 = File.join(path, "marked_for_death.txt")
+    @existing2 = File.join(path, "remotesubdir", "marked_for_death_again.txt")
     FileUtils.touch(@existing1)
     FileUtils.touch(@existing2)
   end
@@ -59,12 +59,12 @@ describe Chef::Resource::RemoteDirectory do
   # See spec/data/cookbooks/openldap/files/default
   let(:expected_files) do
     [
-      File.join(path, 'remote_dir_file1.txt'),
-      File.join(path, 'remote_dir_file2.txt'),
-      File.join(path, 'remotesubdir', 'remote_subdir_file1.txt'),
-      File.join(path, 'remotesubdir', 'remote_subdir_file2.txt'),
-      File.join(path, 'remotesubdir', '.a_dotfile'),
-      File.join(path, '.a_dotdir', '.a_dotfile_in_a_dotdir')
+      File.join(path, "remote_dir_file1.txt"),
+      File.join(path, "remote_dir_file2.txt"),
+      File.join(path, "remotesubdir", "remote_subdir_file1.txt"),
+      File.join(path, "remotesubdir", "remote_subdir_file2.txt"),
+      File.join(path, "remotesubdir", ".a_dotfile"),
+      File.join(path, ".a_dotdir", ".a_dotfile_in_a_dotdir"),
     ]
   end
 
@@ -133,11 +133,11 @@ describe Chef::Resource::RemoteDirectory do
       end
 
       it "leaves modifications alone" do
-        FileUtils.mkdir_p(File.join(path, 'remotesubdir'))
-        modified_file = File.join(path, 'remote_dir_file1.txt')
-        modified_subdir_file = File.join(path, 'remotesubdir', 'remote_subdir_file1.txt')
-        File.open(modified_file, 'a') {|f| f.puts "santa is real"}
-        File.open(modified_subdir_file, 'a') {|f| f.puts "so is rudolph"}
+        FileUtils.mkdir_p(File.join(path, "remotesubdir"))
+        modified_file = File.join(path, "remote_dir_file1.txt")
+        modified_subdir_file = File.join(path, "remotesubdir", "remote_subdir_file1.txt")
+        File.open(modified_file, "a") { |f| f.puts "santa is real" }
+        File.open(modified_subdir_file, "a") { |f| f.puts "so is rudolph" }
         modified_file_checksum = sha256_checksum(modified_file)
         modified_subdir_file_checksum = sha256_checksum(modified_subdir_file)
 
@@ -190,11 +190,11 @@ describe Chef::Resource::RemoteDirectory do
 
     context "and there are deeply nested extraneous files in the directory" do
       before do
-        FileUtils.mkdir_p(File.join(path, 'a', 'multiply', 'nested', 'directory'))
-        @existing1 = File.join(path, 'a', 'foo.txt')
-        @existing2 = File.join(path, 'a', 'multiply', 'bar.txt')
-        @existing3 = File.join(path, 'a', 'multiply', 'nested', 'baz.txt')
-        @existing4 = File.join(path, 'a', 'multiply', 'nested', 'directory', 'qux.txt')
+        FileUtils.mkdir_p(File.join(path, "a", "multiply", "nested", "directory"))
+        @existing1 = File.join(path, "a", "foo.txt")
+        @existing2 = File.join(path, "a", "multiply", "bar.txt")
+        @existing3 = File.join(path, "a", "multiply", "nested", "baz.txt")
+        @existing4 = File.join(path, "a", "multiply", "nested", "directory", "qux.txt")
         FileUtils.touch(@existing1)
         FileUtils.touch(@existing2)
         FileUtils.touch(@existing3)

data/spec/functional/resource/remote_file_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'tiny_server'
-require 'support/shared/functional/http'
+require "spec_helper"
+require "tiny_server"
+require "support/shared/functional/http"
 
 describe Chef::Resource::RemoteFile do
   include ChefHTTPShared
@@ -64,10 +64,10 @@ describe Chef::Resource::RemoteFile do
     end
 
     describe "when redownload isn't necessary" do
-      let(:source) { 'http://localhost:9000/seattle_capo.png' }
+      let(:source) { "http://localhost:9000/seattle_capo.png" }
 
       before do
-        @api.get("/seattle_capo.png", 304, "", { 'Etag' => 'abcdef' } )
+        @api.get("/seattle_capo.png", 304, "", { "Etag" => "abcdef" } )
       end
 
       it "does not fetch the file" do
@@ -76,7 +76,7 @@ describe Chef::Resource::RemoteFile do
     end
 
     context "when using normal encoding" do
-      let(:source) { 'http://localhost:9000/nyan_cat.png' }
+      let(:source) { "http://localhost:9000/nyan_cat.png" }
       let(:expected_content) { binread(nyan_uncompressed_filename) }
 
       it_behaves_like "a file resource"
@@ -85,7 +85,7 @@ describe Chef::Resource::RemoteFile do
     end
 
     context "when using gzip encoding" do
-      let(:source) { 'http://localhost:9000/nyan_cat.png.gz' }
+      let(:source) { "http://localhost:9000/nyan_cat.png.gz" }
       let(:expected_content) { binread(nyan_compressed_filename) }
 
       it_behaves_like "a file resource"
@@ -115,7 +115,7 @@ describe Chef::Resource::RemoteFile do
       stop_tiny_server
     end
 
-    let(:source) { 'https://localhost:9000/nyan_cat.png' }
+    let(:source) { "https://localhost:9000/nyan_cat.png" }
 
     let(:expected_content) { binread(nyan_uncompressed_filename) }
 
@@ -134,7 +134,7 @@ describe Chef::Resource::RemoteFile do
 
     context "when downloading compressed data" do
       let(:expected_content) { binread(nyan_uncompressed_filename) }
-      let(:source) { 'http://localhost:9000/nyan_cat_content_length_compressed.png' }
+      let(:source) { "http://localhost:9000/nyan_cat_content_length_compressed.png" }
 
       before do
         expect(File).not_to exist(path)
@@ -156,7 +156,7 @@ describe Chef::Resource::RemoteFile do
 
     context "when downloding uncompressed data" do
       let(:expected_content) { binread(nyan_uncompressed_filename) }
-      let(:source) { 'http://localhost:9000/nyan_cat_content_length.png' }
+      let(:source) { "http://localhost:9000/nyan_cat_content_length.png" }
 
       before do
         expect(File).not_to exist(path)
@@ -177,7 +177,7 @@ describe Chef::Resource::RemoteFile do
     end
 
     context "when downloading truncated compressed data" do
-      let(:source) { 'http://localhost:9000/nyan_cat_truncated_compressed.png' }
+      let(:source) { "http://localhost:9000/nyan_cat_truncated_compressed.png" }
 
       before do
         expect(File).not_to exist(path)
@@ -190,7 +190,7 @@ describe Chef::Resource::RemoteFile do
     end
 
     context "when downloding truncated uncompressed data" do
-      let(:source) { 'http://localhost:9000/nyan_cat_truncated.png' }
+      let(:source) { "http://localhost:9000/nyan_cat_truncated.png" }
 
       before do
         expect(File).not_to exist(path)
@@ -204,7 +204,7 @@ describe Chef::Resource::RemoteFile do
 
     context "when downloding data with transfer-encoding set" do
       let(:expected_content) { binread(nyan_uncompressed_filename) }
-      let(:source) { 'http://localhost:9000/nyan_cat_transfer_encoding.png' }
+      let(:source) { "http://localhost:9000/nyan_cat_transfer_encoding.png" }
 
       before do
         expect(File).not_to exist(path)
@@ -225,14 +225,14 @@ describe Chef::Resource::RemoteFile do
     end
 
     describe "when the download of the source raises an exception" do
-      let(:source) { 'http://localhost:0000/seattle_capo.png' }
+      let(:source) { "http://localhost:0000/seattle_capo.png" }
 
       before do
         expect(File).not_to exist(path)
       end
 
       it "should not create the file" do
-        expect{ resource.run_action(:create) }.to raise_error
+        expect { resource.run_action(:create) }.to raise_error
         expect(File).not_to exist(path)
       end
     end

data/spec/functional/resource/rpm_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'functional/resource/base'
-require 'chef/mixin/shell_out'
+require "spec_helper"
+require "functional/resource/base"
+require "chef/mixin/shell_out"
 
 # run this test only for following platforms.
-exclude_test = !['aix', 'centos', 'redhat', 'suse'].include?(ohai[:platform])
+exclude_test = !["aix", "centos", "redhat", "suse"].include?(ohai[:platform])
 describe Chef::Resource::RpmPackage, :requires_root, :external => exclude_test do
   include Chef::Mixin::ShellOut
 
@@ -60,13 +60,13 @@ describe Chef::Resource::RpmPackage, :requires_root, :external => exclude_test d
     when "aix"
       @pkg_name = "dummy"
       @pkg_version = "1-0"
-      @pkg_path = "/tmp/dummy-1-0.aix6.1.noarch.rpm"
-      FileUtils.cp(File.join(CHEF_SPEC_ASSETS, 'dummy-1-0.aix6.1.noarch.rpm') , @pkg_path)
+      @pkg_path = "#{Dir.tmpdir}/dummy-1-0.aix6.1.noarch.rpm"
+      FileUtils.cp(File.join(CHEF_SPEC_ASSETS, "dummy-1-0.aix6.1.noarch.rpm") , @pkg_path)
     when "centos", "redhat", "suse"
       @pkg_name = "mytest"
       @pkg_version = "1.0-1"
-      @pkg_path = "/tmp/mytest-1.0-1.noarch.rpm"
-      FileUtils.cp(File.join(CHEF_SPEC_ASSETS, 'mytest-1.0-1.noarch.rpm') , @pkg_path)
+      @pkg_path = "#{Dir.tmpdir}/mytest-1.0-1.noarch.rpm"
+      FileUtils.cp(File.join(CHEF_SPEC_ASSETS, "mytest-1.0-1.noarch.rpm") , @pkg_path)
     end
   end
 
@@ -99,14 +99,14 @@ describe Chef::Resource::RpmPackage, :requires_root, :external => exclude_test d
   context "package upgrade action" do
     before(:each) do
       shell_out("rpm -i #{@pkg_path}")
-      if ohai[:platform] == 'aix'
+      if ohai[:platform] == "aix"
         @pkg_version = "2-0"
-        @pkg_path = "/tmp/dummy-2-0.aix6.1.noarch.rpm"
-        FileUtils.cp(File.join(CHEF_SPEC_ASSETS, 'dummy-2-0.aix6.1.noarch.rpm') , @pkg_path)
+        @pkg_path = "#{Dir.tmpdir}/dummy-2-0.aix6.1.noarch.rpm"
+        FileUtils.cp(File.join(CHEF_SPEC_ASSETS, "dummy-2-0.aix6.1.noarch.rpm") , @pkg_path)
       else
         @pkg_version = "2.0-1"
-        @pkg_path = "/tmp/mytest-2.0-1.noarch.rpm"
-        FileUtils.cp(File.join(CHEF_SPEC_ASSETS, 'mytest-2.0-1.noarch.rpm') , @pkg_path)
+        @pkg_path = "#{Dir.tmpdir}/mytest-2.0-1.noarch.rpm"
+        FileUtils.cp(File.join(CHEF_SPEC_ASSETS, "mytest-2.0-1.noarch.rpm") , @pkg_path)
       end
     end
 

data/spec/functional/resource/template_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::Template do
 
   def binread(file)
-    File.open(file,"rb") {|f| f.read }
+    File.open(file, "rb") { |f| f.read }
   end
 
   include_context Chef::Resource::File
@@ -44,8 +44,8 @@ describe Chef::Resource::Template do
     events = Chef::EventDispatch::Dispatcher.new
     run_context = Chef::RunContext.new(node, cookbook_collection, events)
     resource = Chef::Resource::Template.new(path, run_context)
-    resource.source('openldap_stuff.conf.erb')
-    resource.cookbook('openldap')
+    resource.source("openldap_stuff.conf.erb")
+    resource.cookbook("openldap")
 
     # NOTE: partials rely on `cookbook_name` getting set by chef internals and
     # ignore the user-set `cookbook` attribute.
@@ -66,14 +66,14 @@ describe Chef::Resource::Template do
 
   context "when the target file does not exist" do
     it "creates the template with the rendered content using the variable attribute when the :create action is run" do
-      resource.source('openldap_variable_stuff.conf.erb')
+      resource.source("openldap_variable_stuff.conf.erb")
       resource.variables(:secret => "nutella")
       resource.run_action(:create)
       expect(IO.read(path)).to eq("super secret is nutella")
     end
 
     it "creates the template with the rendered content using a local erb file when the :create action is run" do
-      resource.source(File.expand_path(File.join(CHEF_SPEC_DATA,'cookbooks','openldap','templates','default','openldap_stuff.conf.erb')))
+      resource.source(File.expand_path(File.join(CHEF_SPEC_DATA, "cookbooks", "openldap", "templates", "default", "openldap_stuff.conf.erb")))
       resource.cookbook(nil)
       resource.local(true)
       resource.run_action(:create)

data/spec/functional/resource/user/dscl_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/mixin/shell_out'
+require "spec_helper"
+require "chef/mixin/shell_out"
 
 metadata = {
   :mac_osx_only => true,

data/spec/functional/resource/user/useradd_spec.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,9 +17,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'functional/resource/base'
-require 'chef/mixin/shell_out'
+require "spec_helper"
+require "functional/resource/base"
+require "chef/mixin/shell_out"
 
 def user_provider_for_platform
   case ohai[:platform]
@@ -31,26 +31,25 @@ def user_provider_for_platform
 end
 
 metadata = { :unix_only => true,
-  :requires_root => true,
-  :not_supported_on_mac_osx => true,
-  :provider => {:user => user_provider_for_platform}
+             :requires_root => true,
+             :not_supported_on_mac_osx => true,
+             :provider => { :user => user_provider_for_platform },
 }
 
 describe Chef::Provider::User::Useradd, metadata do
 
   include Chef::Mixin::ShellOut
 
-
   # Utility code for /etc/passwd interaction, avoid any caching of user records:
   PwEntry = Struct.new(:name, :passwd, :uid, :gid, :gecos, :home, :shell)
 
   class UserNotFound < StandardError; end
 
   def pw_entry
-    passwd_file = File.open("/etc/passwd", "rb") {|f| f.read}
+    passwd_file = File.open("/etc/passwd", "rb") { |f| f.read }
     matcher = /^#{Regexp.escape(username)}.+$/
     if passwd_entry = passwd_file.scan(matcher).first
-      PwEntry.new(*passwd_entry.split(':'))
+      PwEntry.new(*passwd_entry.split(":"))
     else
       raise UserNotFound, "no entry matching #{matcher.inspect} found in /etc/passwd"
     end
@@ -59,9 +58,9 @@ describe Chef::Provider::User::Useradd, metadata do
   def etc_shadow
     case ohai[:platform]
     when "aix"
-      File.open("/etc/security/passwd") {|f| f.read }
+      File.open("/etc/security/passwd") { |f| f.read }
     else
-      File.open("/etc/shadow") {|f| f.read }
+      File.open("/etc/shadow") { |f| f.read }
     end
   end
 
@@ -82,13 +81,13 @@ describe Chef::Provider::User::Useradd, metadata do
   end
 
   def try_cleanup
-    ['/home/cheftestfoo', '/home/cheftestbar'].each do |f|
+    ["/home/cheftestfoo", "/home/cheftestbar"].each do |f|
       FileUtils.rm_rf(f) if File.exists? f
     end
 
-    ['cf-test'].each do |u|
+    ["cf-test"].each do |u|
       r = Chef::Resource::User.new("DELETE USER", run_context)
-      r.username('cf-test')
+      r.username("cf-test")
       r.run_action(:remove)
     end
   end
@@ -104,7 +103,7 @@ describe Chef::Provider::User::Useradd, metadata do
     while max_retries > 0
       begin
         pw_entry # will raise if the user doesn't exist
-        status = shell_out!("userdel", "-r", username, :returns => [0,8,12])
+        status = shell_out!("userdel", "-r", username, :returns => [0, 8, 12])
 
         # Error code 8 during userdel indicates that the user is logged in.
         # This occurs randomly because the accounts daemon holds a lock due to which userdel fails.
@@ -160,7 +159,7 @@ describe Chef::Provider::User::Useradd, metadata do
 
   let(:expected_shadow) do
     if ohai[:platform] == "aix"
-      expected_shadow = "cf-test"  # For aix just check user entry in shadow file
+      expected_shadow = "cf-test" # For aix just check user entry in shadow file
     else
       expected_shadow = "cf-test:$1$RRa/wMM/$XltKfoX5ffnexVF4dHZZf/"
     end
@@ -174,7 +173,6 @@ describe Chef::Provider::User::Useradd, metadata do
         expect(user_resource).to be_updated_by_last_action
       end
 
-
       it "ensures the user exists" do
         expect(pw_entry.name).to eq(username)
       end
@@ -194,7 +192,6 @@ describe Chef::Provider::User::Useradd, metadata do
         end
       end
 
-
       context "when uid is set" do
         # Should verify uid not in use...
         let(:uid) { 1999 }
@@ -242,17 +239,17 @@ describe Chef::Provider::User::Useradd, metadata do
         let(:home) { "/home/#{username}" }
 
         it "ensures the user's home is set to the given path" do
-          expect(pw_entry.home).to eq("/home/#{username}")
+          expect(pw_entry.home).to eq(home)
         end
 
-        if %w{rhel fedora}.include?(OHAI_SYSTEM["platform_family"])
+        if %w{rhel fedora wrlinux}.include?(OHAI_SYSTEM["platform_family"])
           # Inconsistent behavior. See: CHEF-2205
           it "creates the home dir when not explicitly asked to on RHEL (XXX)" do
-            expect(File).to exist("/home/#{username}")
+            expect(File).to exist(home)
           end
         else
           it "does not create the home dir without `manage_home'" do
-            expect(File).not_to exist("/home/#{username}")
+            expect(File).not_to exist(home)
           end
         end
 
@@ -260,7 +257,7 @@ describe Chef::Provider::User::Useradd, metadata do
           let(:manage_home) { true }
 
           it "ensures the user's home directory exists" do
-            expect(File).to exist("/home/#{username}")
+            expect(File).to exist(home)
           end
         end
       end
@@ -287,16 +284,16 @@ describe Chef::Provider::User::Useradd, metadata do
         let(:uid_min) do
           case ohai[:platform]
           when "aix"
-            # UIDs and GIDs below 100 are typically reserved for system accounts and services
-            # http://www.ibm.com/developerworks/aix/library/au-satuidgid/
-            100
+            # UIDs and GIDs below 200 are typically reserved for system accounts and services
+            # https://abcofaix.wordpress.com/tag/usermod/
+            200
           else
             # from `man useradd`, login user means uid will be between
             # UID_SYS_MIN and UID_SYS_MAX defined in /etc/login.defs. On my
             # Ubuntu 13.04 system, these are commented out, so we'll look at
             # UID_MIN to find the lower limit of the non-system-user range, and
             # use that value in our assertions.
-            login_defs = File.open("/etc/login.defs", "rb") {|f| f.read }
+            login_defs = File.open("/etc/login.defs", "rb") { |f| f.read }
             uid_min_scan = /^UID_MIN\s+(\d+)/
             login_defs.match(uid_min_scan)[1]
           end
@@ -455,7 +452,6 @@ describe Chef::Provider::User::Useradd, metadata do
           end
         end
 
-
         it "ensures the password is set" do
           password_should_be_set
           expect(etc_shadow).to include(expected_shadow)
@@ -484,7 +480,6 @@ describe Chef::Provider::User::Useradd, metadata do
           end
         end
 
-
         it "ensures the password is set to the desired value" do
           password_should_be_set
           expect(etc_shadow).to include(expected_shadow)
@@ -518,11 +513,11 @@ describe Chef::Provider::User::Useradd, metadata do
     let(:user_locked_context?) { false }
 
     def shadow_entry
-      etc_shadow.lines.select {|l| l.include?(username) }.first
+      etc_shadow.lines.select { |l| l.include?(username) }.first
     end
 
     def shadow_password
-      shadow_entry.split(':')[1]
+      shadow_entry.split(":")[1]
     end
 
     def aix_user_lock_status
@@ -596,7 +591,6 @@ describe Chef::Provider::User::Useradd, metadata do
           end
         end
 
-
         it "locks the user's password" do
           user_account_should_be_locked
         end
@@ -644,7 +638,7 @@ describe Chef::Provider::User::Useradd, metadata do
       context "and has no password" do
 
         # TODO: platform_family should be setup in spec_helper w/ tags
-        if %w[suse opensuse].include?(OHAI_SYSTEM["platform_family"])
+        if %w{suse opensuse}.include?(OHAI_SYSTEM["platform_family"])
           # suse gets this right:
           it "errors out trying to unlock the user" do
             expect(@error).to be_a(Mixlib::ShellOut::ShellCommandFailed)
@@ -665,10 +659,10 @@ describe Chef::Provider::User::Useradd, metadata do
             # DEBUG: Ran usermod -U chef-functional-test returned 0
             expect(@error).to be_nil
             if ohai[:platform] == "aix"
-              expect(pw_entry.passwd).to eq('*')
+              expect(pw_entry.passwd).to eq("*")
               user_account_should_be_unlocked
             else
-              expect(pw_entry.passwd).to eq('x')
+              expect(pw_entry.passwd).to eq("x")
               expect(shadow_password).to include("!")
             end
           end