From af4afcc712d24dbc85a9c020a124acadeed295d2 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Wed, 13 Jan 2016 11:44:32 -0800 Subject: autocorrecting Style/TrailingComma chefstyle -a fixed 1044 occurrances --- spec/unit/provider/execute_spec.rb | 2 +- spec/unit/provider/git_spec.rb | 4 +- spec/unit/provider/group/usermod_spec.rb | 2 +- spec/unit/provider/group_spec.rb | 2 +- spec/unit/provider/ohai_spec.rb | 4 +- spec/unit/provider/osx_profile_spec.rb | 14 ++-- spec/unit/provider/package/apt_spec.rb | 40 +++++------ spec/unit/provider/package/easy_install_spec.rb | 12 ++-- spec/unit/provider/package/homebrew_spec.rb | 16 ++--- spec/unit/provider/package/windows/exe_spec.rb | 8 +-- spec/unit/provider/package/windows/msi_spec.rb | 8 +-- spec/unit/provider/package/windows_spec.rb | 6 +- spec/unit/provider/package/yum_spec.rb | 78 +++++++++++----------- spec/unit/provider/package_spec.rb | 30 ++++----- spec/unit/provider/remote_file/content_spec.rb | 2 +- spec/unit/provider/service/debian_service_spec.rb | 34 +++++----- .../provider/service/solaris_smf_service_spec.rb | 6 +- spec/unit/provider/user/pw_spec.rb | 2 +- spec/unit/provider/user/useradd_spec.rb | 2 +- spec/unit/provider/user_spec.rb | 4 +- 20 files changed, 138 insertions(+), 138 deletions(-) (limited to 'spec/unit/provider') diff --git a/spec/unit/provider/execute_spec.rb b/spec/unit/provider/execute_spec.rb index 3af35a17ca..8a55025d9e 100644 --- a/spec/unit/provider/execute_spec.rb +++ b/spec/unit/provider/execute_spec.rb @@ -33,7 +33,7 @@ describe Chef::Provider::Execute do timeout: 3600, returns: 0, log_level: :info, - log_tag: new_resource.to_s + log_tag: new_resource.to_s, } end diff --git a/spec/unit/provider/git_spec.rb b/spec/unit/provider/git_spec.rb index 0106244665..41536a450f 100644 --- a/spec/unit/provider/git_spec.rb +++ b/spec/unit/provider/git_spec.rb @@ -224,7 +224,7 @@ SHAS { :user => deploy_user, :environment => { "GIT_SSH" => wrapper, "HOME" => "/home/deployNinja" }, - :log_tag => "git[web2.0 app]" + :log_tag => "git[web2.0 app]", } end before do @@ -254,7 +254,7 @@ SHAS { :user => deploy_user, :environment => { "GIT_SSH" => wrapper, "HOME" => "/home/masterNinja" }, - :log_tag => "git[web2.0 app]" + :log_tag => "git[web2.0 app]", } end before do diff --git a/spec/unit/provider/group/usermod_spec.rb b/spec/unit/provider/group/usermod_spec.rb index a11d790d07..6c4c4d2e07 100644 --- a/spec/unit/provider/group/usermod_spec.rb +++ b/spec/unit/provider/group/usermod_spec.rb @@ -52,7 +52,7 @@ describe Chef::Provider::Group::Usermod do "suse" => "-a -G", "opensuse" => "-a -G", "smartos" => "-G", - "omnios" => "-G" + "omnios" => "-G", } before do diff --git a/spec/unit/provider/group_spec.rb b/spec/unit/provider/group_spec.rb index b36bfe364b..55a2f97aa5 100644 --- a/spec/unit/provider/group_spec.rb +++ b/spec/unit/provider/group_spec.rb @@ -39,7 +39,7 @@ describe Chef::Provider::User do @pw_group = double("Struct::Group", :name => "wheel", :gid => 20, - :mem => [ "root", "aj" ] + :mem => [ "root", "aj" ], ) allow(Etc).to receive(:getgrnam).with('wheel').and_return(@pw_group) end diff --git a/spec/unit/provider/ohai_spec.rb b/spec/unit/provider/ohai_spec.rb index 45688cedb7..4072487f35 100644 --- a/spec/unit/provider/ohai_spec.rb +++ b/spec/unit/provider/ohai_spec.rb @@ -38,8 +38,8 @@ describe Chef::Provider::Ohai do }, :data2 => { :origdata => "somevalue", - :newdata => "somevalue" - } + :newdata => "somevalue", + }, } allow(mock_ohai).to receive(:all_plugins).and_return(true) allow(mock_ohai).to receive(:data).and_return(mock_ohai[:data], diff --git a/spec/unit/provider/osx_profile_spec.rb b/spec/unit/provider/osx_profile_spec.rb index 85f9d56e16..2e87faeb48 100644 --- a/spec/unit/provider/osx_profile_spec.rb +++ b/spec/unit/provider/osx_profile_spec.rb @@ -67,7 +67,7 @@ describe Chef::Provider::OsxProfile do "ProfileType"=>"Configuration", "ProfileUUID"=>"6e95927c-f200-54b4-85c7-52ab99b61c47", "ProfileVerificationState"=>"unsigned", - "ProfileVersion"=>1}], + "ProfileVersion"=>1}] } end # If anything is changed within this profile, be sure to update the @@ -95,14 +95,14 @@ describe Chef::Provider::OsxProfile do 'Forced' => [ { 'mcx_preference_settings' => { - 'idleTime' => 0, + 'idleTime' => 0 } - } + }, ] } - } - } - ] + }, + }, + ], } end let(:no_profiles) do @@ -232,7 +232,7 @@ describe Chef::Provider::OsxProfile do "ProfileType"=>"Configuration", "ProfileUUID"=>"1781fbec-3325-565f-9022-8aa28135c3cc", "ProfileVerificationState"=>"unsigned", - "ProfileVersion"=>1}], + "ProfileVersion"=>1}] } end before(:each) do diff --git a/spec/unit/provider/package/apt_spec.rb b/spec/unit/provider/package/apt_spec.rb index 8528480689..f1845abfb1 100644 --- a/spec/unit/provider/package/apt_spec.rb +++ b/spec/unit/provider/package/apt_spec.rb @@ -52,7 +52,7 @@ irssi: it "should create a current resource with the name of the new_resource" do expect(@provider).to receive(:shell_out!).with( "apt-cache policy #{@new_resource.package_name}", - :timeout => @timeout + :timeout => @timeout, ).and_return(@shell_out) @provider.load_current_resource @@ -95,7 +95,7 @@ libmysqlclient15-dev: virtual_package = double(:stdout => virtual_package_out,:exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache policy libmysqlclient15-dev", - :timeout => @timeout + :timeout => @timeout, ).and_return(virtual_package) showpkg_out =<<-SHOWPKG_STDOUT Package: libmysqlclient15-dev @@ -118,7 +118,7 @@ libmysqlclient-dev 5.1.41-3ubuntu12 showpkg = double(:stdout => showpkg_out,:exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache showpkg libmysqlclient15-dev", - :timeout => @timeout + :timeout => @timeout, ).and_return(showpkg) real_package_out=<<-RPKG_STDOUT libmysqlclient-dev: @@ -136,7 +136,7 @@ libmysqlclient-dev: real_package = double(:stdout => real_package_out,:exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache policy libmysqlclient-dev", - :timeout => @timeout + :timeout => @timeout, ).and_return(real_package) @provider.load_current_resource end @@ -152,7 +152,7 @@ mp3-decoder: virtual_package = double(:stdout => virtual_package_out,:exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache policy mp3-decoder", - :timeout => @timeout + :timeout => @timeout, ).and_return(virtual_package) showpkg_out=<<-SHOWPKG_STDOUT Package: mp3-decoder @@ -178,7 +178,7 @@ mpg123 1.12.1-0ubuntu1 showpkg = double(:stdout => showpkg_out,:exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache showpkg mp3-decoder", - :timeout => @timeout + :timeout => @timeout, ).and_return(showpkg) expect { @provider.load_current_resource }.to raise_error(Chef::Exceptions::Package) end @@ -191,7 +191,7 @@ mpg123 1.12.1-0ubuntu1 allow(@new_resource).to receive(:provider).and_return(nil) expect(@provider).to receive(:shell_out!).with( "apt-cache -o APT::Default-Release=lenny-backports policy irssi", - :timeout => @timeout + :timeout => @timeout, ).and_return(@shell_out) @provider.load_current_resource end @@ -200,7 +200,7 @@ mpg123 1.12.1-0ubuntu1 @new_resource.source "pluto" expect(@provider).to receive(:shell_out!).with( "apt-cache policy #{@new_resource.package_name}", - :timeout => @timeout + :timeout => @timeout, ).and_return(@shell_out) @provider.load_current_resource @provider.define_resource_requirements @@ -220,7 +220,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!). with( "apt-get -q -y install irssi=0.8.12-7", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil}, - :timeout => @timeout + :timeout => @timeout, ) @provider.install_package("irssi", "0.8.12-7") end @@ -229,7 +229,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y --force-yes install irssi=0.8.12-7", :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout + :timeout => @timeout, ) @new_resource.options("--force-yes") @provider.install_package("irssi", "0.8.12-7") @@ -245,7 +245,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y -o APT::Default-Release=lenny-backports install irssi=0.8.12-7", :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout + :timeout => @timeout, ) @provider.install_package("irssi", "0.8.12-7") @@ -266,7 +266,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y remove irssi", :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil}, - :timeout => @timeout + :timeout => @timeout, ) @provider.remove_package("irssi", "0.8.12-7") end @@ -275,7 +275,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y --force-yes remove irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout + :timeout => @timeout, ) @new_resource.options("--force-yes") @@ -289,7 +289,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y purge irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout + :timeout => @timeout, ) @provider.purge_package("irssi", "0.8.12-7") end @@ -298,7 +298,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y --force-yes purge irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout + :timeout => @timeout, ) @new_resource.options("--force-yes") @@ -317,7 +317,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "debconf-set-selections /tmp/irssi-0.8.12-7.seed", :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil}, - :timeout => @timeout + :timeout => @timeout, ) @provider.preseed_package(file) @@ -327,7 +327,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "debconf-set-selections /tmp/irssi-0.8.12-7.seed", :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil}, - :timeout => @timeout + :timeout => @timeout, ) file = @provider.get_preseed_file("irssi", "0.8.12-7") @provider.preseed_package(file) @@ -348,7 +348,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "dpkg-reconfigure irssi", :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout + :timeout => @timeout, ) @provider.reconfig_package("irssi", "0.8.12-7") end @@ -360,7 +360,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y install libmysqlclient-dev", :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout + :timeout => @timeout, ) @provider.install_package("libmysqlclient-dev", "not_a_real_version") end @@ -374,7 +374,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y install libmysqlclient-dev irssi=0.8.12-7", :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout + :timeout => @timeout, ) @provider.install_package(["libmysqlclient-dev", "irssi"], ["not_a_real_version", "0.8.12-7"]) end diff --git a/spec/unit/provider/package/easy_install_spec.rb b/spec/unit/provider/package/easy_install_spec.rb index b734bc57cf..4ac325e7d4 100644 --- a/spec/unit/provider/package/easy_install_spec.rb +++ b/spec/unit/provider/package/easy_install_spec.rb @@ -63,14 +63,14 @@ describe Chef::Provider::Package::EasyInstall do it "should run easy_install with the package name and version" do expect(@provider).to receive(:run_command).with({ :command => "easy_install \"boto==1.8d\"" - }) + },) @provider.install_package("boto", "1.8d") end it "should run easy_install with the package name and version and specified options" do expect(@provider).to receive(:run_command).with({ :command => "easy_install --always-unzip \"boto==1.8d\"" - }) + },) allow(@new_resource).to receive(:options).and_return("--always-unzip") @provider.install_package("boto", "1.8d") end @@ -78,21 +78,21 @@ describe Chef::Provider::Package::EasyInstall do it "should run easy_install with the package name and version" do expect(@provider).to receive(:run_command).with({ :command => "easy_install \"boto==1.8d\"" - }) + },) @provider.upgrade_package("boto", "1.8d") end it "should run easy_install -m with the package name and version" do expect(@provider).to receive(:run_command).with({ :command => "easy_install -m boto" - }) + },) @provider.remove_package("boto", "1.8d") end it "should run easy_install -m with the package name and version and specified options" do expect(@provider).to receive(:run_command).with({ :command => "easy_install -x -m boto" - }) + },) allow(@new_resource).to receive(:options).and_return("-x") @provider.remove_package("boto", "1.8d") end @@ -100,7 +100,7 @@ describe Chef::Provider::Package::EasyInstall do it "should run easy_install -m with the package name and version" do expect(@provider).to receive(:run_command).with({ :command => "easy_install -m boto" - }) + },) @provider.purge_package("boto", "1.8d") end diff --git a/spec/unit/provider/package/homebrew_spec.rb b/spec/unit/provider/package/homebrew_spec.rb index d01d455b09..926c1a0ff0 100644 --- a/spec/unit/provider/package/homebrew_spec.rb +++ b/spec/unit/provider/package/homebrew_spec.rb @@ -38,7 +38,7 @@ describe Chef::Provider::Package::Homebrew do 'stable' => '24.3', 'bottle' => false, 'devel' => nil, - 'head' => nil + 'head' => nil, }, 'revision' => 0, 'installed' => [], @@ -47,7 +47,7 @@ describe Chef::Provider::Package::Homebrew do 'dependencies' => [], 'conflicts_with' => [], 'caveats' => nil, - 'options' => [] + 'options' => [], } end @@ -59,7 +59,7 @@ describe Chef::Provider::Package::Homebrew do 'stable' => '24.3', 'bottle' => false, 'devel' => nil, - 'head' => 'HEAD' + 'head' => 'HEAD', }, 'revision' => 0, 'installed' => [{ 'version' => '24.3' }], @@ -68,7 +68,7 @@ describe Chef::Provider::Package::Homebrew do 'dependencies' => [], 'conflicts_with' => [], 'caveats' => '', - 'options' => [] + 'options' => [], } end @@ -80,7 +80,7 @@ describe Chef::Provider::Package::Homebrew do 'stable' => '24.3-keggy', 'bottle' => false, 'devel' => nil, - 'head' => 'HEAD' + 'head' => 'HEAD', }, 'revision' => 0, 'installed' => [{ 'version' => '24.3-keggy' }], @@ -89,7 +89,7 @@ describe Chef::Provider::Package::Homebrew do 'dependencies' => [], 'conflicts_with' => [], 'caveats' => '', - 'options' => [] + 'options' => [], } end @@ -101,7 +101,7 @@ describe Chef::Provider::Package::Homebrew do 'stable' => '24.3-keggy', 'bottle' => false, 'devel' => nil, - 'head' => 'HEAD' + 'head' => 'HEAD', }, 'revision' => 0, 'installed' => [], @@ -110,7 +110,7 @@ describe Chef::Provider::Package::Homebrew do 'dependencies' => [], 'conflicts_with' => [], 'caveats' => '', - 'options' => [] + 'options' => [], } end diff --git a/spec/unit/provider/package/windows/exe_spec.rb b/spec/unit/provider/package/windows/exe_spec.rb index 677ab87f29..6756ffa9e0 100644 --- a/spec/unit/provider/package/windows/exe_spec.rb +++ b/spec/unit/provider/package/windows/exe_spec.rb @@ -42,7 +42,7 @@ describe Chef::Provider::Package::Windows::Exe do let(:uninstall_hash) do [{ 'DisplayVersion' => 'outdated', - 'UninstallString' => File.join("uninst_dir", "uninst_file") + 'UninstallString' => File.join("uninst_dir", "uninst_file"), }] end let(:uninstall_entry) do @@ -122,12 +122,12 @@ describe Chef::Provider::Package::Windows::Exe do [ { 'DisplayVersion' => 'v1', - 'UninstallString' => File.join("uninst_dir1", "uninst_file1") + 'UninstallString' => File.join("uninst_dir1", "uninst_file1"), }, { 'DisplayVersion' => 'v2', - 'UninstallString' => File.join("uninst_dir2", "uninst_file2") - } + 'UninstallString' => File.join("uninst_dir2", "uninst_file2"), + }, ] end diff --git a/spec/unit/provider/package/windows/msi_spec.rb b/spec/unit/provider/package/windows/msi_spec.rb index 9377dcaad9..835bd4ad19 100644 --- a/spec/unit/provider/package/windows/msi_spec.rb +++ b/spec/unit/provider/package/windows/msi_spec.rb @@ -35,7 +35,7 @@ describe Chef::Provider::Package::Windows::MSI do let(:uninstall_hash) do [{ 'DisplayVersion' => 'outdated', - 'UninstallString' => "MsiExec.exe /X{guid}" + 'UninstallString' => "MsiExec.exe /X{guid}", }] end let(:uninstall_entry) do @@ -130,12 +130,12 @@ describe Chef::Provider::Package::Windows::MSI do [ { 'DisplayVersion' => 'outdated', - 'UninstallString' => "MsiExec.exe /X{guid}" + 'UninstallString' => "MsiExec.exe /X{guid}", }, { 'DisplayVersion' => 'really_outdated', - 'UninstallString' => "MsiExec.exe /X{guid2}" - } + 'UninstallString' => "MsiExec.exe /X{guid2}", + }, ] end diff --git a/spec/unit/provider/package/windows_spec.rb b/spec/unit/provider/package/windows_spec.rb index 6952a91d92..200cc9888a 100644 --- a/spec/unit/provider/package/windows_spec.rb +++ b/spec/unit/provider/package/windows_spec.rb @@ -171,7 +171,7 @@ describe Chef::Provider::Package::Windows, :windows_only do let(:uninstall_hash) do [{ 'DisplayVersion' => 'outdated', - 'UninstallString' => "blah blah" + 'UninstallString' => "blah blah", }] end let(:uninstall_key) { "blah" } @@ -192,7 +192,7 @@ describe Chef::Provider::Package::Windows, :windows_only do let(:uninstall_hash) do [{ 'DisplayVersion' => 'outdated', - 'UninstallString' => "MsiExec.exe /X{guid}" + 'UninstallString' => "MsiExec.exe /X{guid}", }] end @@ -205,7 +205,7 @@ describe Chef::Provider::Package::Windows, :windows_only do let(:uninstall_hash) do [{ 'DisplayVersion' => 'outdated', - 'UninstallString' => %q{"c:/hfhfheru/uninst.exe"} + 'UninstallString' => %q{"c:/hfhfheru/uninst.exe"}, }] end diff --git a/spec/unit/provider/package/yum_spec.rb b/spec/unit/provider/package/yum_spec.rb index 41118b70fb..70ab257a54 100644 --- a/spec/unit/provider/package/yum_spec.rb +++ b/spec/unit/provider/package/yum_spec.rb @@ -36,7 +36,7 @@ describe Chef::Provider::Package::Yum do :version_available? => true, :allow_multi_install => [ "kernel" ], :package_repository => "base", - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -172,7 +172,7 @@ describe Chef::Provider::Package::Yum do allow(@yum_cache).to receive(:package_available?) { |pkg| pkg == 'cups' ? true : false } allow(@yum_cache).to receive(:packages_from_require) do |pkg| [Chef::Provider::Package::Yum::RPMDbPackage.new("cups", "1.2.4-11.18.el5_2.3", "noarch", [], false, true, "base"), - Chef::Provider::Package::Yum::RPMDbPackage.new("cups", "1.2.4-11.18.el5_2.2", "noarch", [], false, true, "base"),] + Chef::Provider::Package::Yum::RPMDbPackage.new("cups", "1.2.4-11.18.el5_2.2", "noarch", [], false, true, "base")] end expect(Chef::Log).to receive(:debug).exactly(1).times.with(%r{checking yum info}) expect(Chef::Log).to receive(:debug).exactly(1).times.with(%r{installed version}) @@ -320,7 +320,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "2.0.1.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) } @@ -395,7 +395,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "2.0.1.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -417,7 +417,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -440,7 +440,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "2.0.1.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -465,7 +465,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -485,7 +485,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -510,7 +510,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -580,7 +580,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5_2.3", :package_available? => true, :version_available? => nil, - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -599,7 +599,7 @@ describe Chef::Provider::Package::Yum do :package_available? => true, :version_available? => true, :allow_multi_install => [ "kernel" ], - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -619,7 +619,7 @@ describe Chef::Provider::Package::Yum do :version_available? => true, :allow_multi_install => [ "cups" ], :package_repository => "base", - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -643,7 +643,7 @@ describe Chef::Provider::Package::Yum do :version_available? => true, :allow_multi_install => [], :package_repository => "base", - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -710,7 +710,7 @@ describe Chef::Provider::Package::Yum do :package_available? => true, :version_available? => true, :allow_multi_install => [ "kernel" ], - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -726,7 +726,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:candidate_version).and_return('11') expect(@provider).to receive(:upgrade_package).with( "cups", - "11" + "11", ) @provider.run_action(:upgrade) end @@ -745,7 +745,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:candidate_version).and_return('11') expect(@provider).to receive(:upgrade_package).with( "cups", - "11" + "11", ) @provider.run_action(:upgrade) end @@ -792,7 +792,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).once.with( "yum -d0 -e0 -y install emacs-1.0", - {:timeout => Chef::Config[:yum_timeout]} + {:timeout => Chef::Config[:yum_timeout]}, ) @provider.yum_command("-d0 -e0 -y install emacs-1.0") end @@ -802,7 +802,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).once.with( "yum -d0 -e0 -y install emacs-1.0", - {:timeout => Chef::Config[:yum_timeout]} + {:timeout => Chef::Config[:yum_timeout]}, ) expect { @provider.yum_command("-d0 -e0 -y install emacs-1.0") }.to raise_error(Chef::Exceptions::Exec) end @@ -813,7 +813,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).once.with( "yum -d0 -e0 -y install emacs-1.0", - {:timeout => Chef::Config[:yum_timeout]} + {:timeout => Chef::Config[:yum_timeout]}, ) # will still raise an exception, can't stub out the subsequent call expect { @provider.yum_command("-d0 -e0 -y install emacs-1.0") }.to raise_error(Chef::Exceptions::Exec) @@ -825,7 +825,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).twice.with( "yum -d0 -e0 -y install emacs-1.0", - {:timeout => Chef::Config[:yum_timeout]} + {:timeout => Chef::Config[:yum_timeout]}, ) # will still raise an exception, can't stub out the subsequent call expect { @provider.yum_command("-d0 -e0 -y install emacs-1.0") }.to raise_error(Chef::Exceptions::Exec) @@ -839,7 +839,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).once.with( "yum-deprecated -d0 -e0 -y install emacs-1.0", - {:timeout => Chef::Config[:yum_timeout]} + {:timeout => Chef::Config[:yum_timeout]}, ) @provider.yum_command("-d0 -e0 -y install emacs-1.0") end @@ -856,7 +856,7 @@ describe Chef::Provider::Package::Yum::RPMUtils do [ [ "0:3.3", [ 0, "3.3", nil ] ], [ "9:1.7.3", [ 9, "1.7.3", nil ] ], - [ "15:20020927", [ 15, "20020927", nil ] ] + [ "15:20020927", [ 15, "20020927", nil ] ], ].each do |x, y| expect(@rpmutils.version_parse(x)).to eq(y) end @@ -866,7 +866,7 @@ describe Chef::Provider::Package::Yum::RPMUtils do [ [ ":3.3", [ 0, "3.3", nil ] ], [ "-1:1.7.3", [ nil, nil, "1:1.7.3" ] ], - [ "-:20020927", [ nil, nil, ":20020927" ] ] + [ "-:20020927", [ nil, nil, ":20020927" ] ], ].each do |x, y| expect(@rpmutils.version_parse(x)).to eq(y) end @@ -876,7 +876,7 @@ describe Chef::Provider::Package::Yum::RPMUtils do [ [ "3.3", [ nil, "3.3", nil ] ], [ "1.7.3", [ nil, "1.7.3", nil ] ], - [ "20020927", [ nil, "20020927", nil ] ] + [ "20020927", [ nil, "20020927", nil ] ], ].each do |x, y| expect(@rpmutils.version_parse(x)).to eq(y) end @@ -886,7 +886,7 @@ describe Chef::Provider::Package::Yum::RPMUtils do [ [ "3..3", [ nil, "3..3", nil ] ], [ "0001.7.3", [ nil, "0001.7.3", nil ] ], - [ "20020927,3", [ nil, "20020927,3", nil ] ] + [ "20020927,3", [ nil, "20020927,3", nil ] ], ].each do |x, y| expect(@rpmutils.version_parse(x)).to eq(y) end @@ -896,7 +896,7 @@ describe Chef::Provider::Package::Yum::RPMUtils do [ [ "3.3-0.pre3.1.60.el5_5.1", [ nil, "3.3", "0.pre3.1.60.el5_5.1" ] ], [ "1.7.3-1jpp.2.el5", [ nil, "1.7.3", "1jpp.2.el5" ] ], - [ "20020927-46.el5", [ nil, "20020927", "46.el5" ] ] + [ "20020927-46.el5", [ nil, "20020927", "46.el5" ] ], ].each do |x, y| expect(@rpmutils.version_parse(x)).to eq(y) end @@ -906,7 +906,7 @@ describe Chef::Provider::Package::Yum::RPMUtils do [ [ "3.3-", [ nil, "3.3", nil ] ], [ "-1jpp.2.el5", [ nil, nil, "1jpp.2.el5" ] ], - [ "-0020020927-46.el5", [ nil, "-0020020927", "46.el5" ] ] + [ "-0020020927-46.el5", [ nil, "-0020020927", "46.el5" ] ], ].each do |x, y| expect(@rpmutils.version_parse(x)).to eq(y) end @@ -982,7 +982,7 @@ describe Chef::Provider::Package::Yum::RPMUtils do [ nil, "1.0.1", -1 ], [ "1.0.1", "", 1 ], [ "", "", 0 ], - [ "", "1.0.1", -1 ] + [ "", "1.0.1", -1 ], ].each do |x, y, result| expect(@rpmutils.rpmvercmp(x,y)).to eq(result) end @@ -1001,7 +1001,7 @@ describe Chef::Provider::Package::Yum::RPMUtils do end it "tests isalpha good input" do - [ 'a', 'z', 'A', 'Z', ].each do |t| + [ 'a', 'z', 'A', 'Z' ].each do |t| expect(@rpmutils.isalpha(t)).to eq(true) end end @@ -1013,7 +1013,7 @@ describe Chef::Provider::Package::Yum::RPMUtils do end it "tests isdigit good input" do - [ '0', '9', ].each do |t| + [ '0', '9' ].each do |t| expect(@rpmutils.isdigit(t)).to eq(true) end end @@ -1102,7 +1102,7 @@ describe Chef::Provider::Package::Yum::RPMVersion do [ "0:1.4.10-7.20090624svn.el5", "0:1.4.10-7.20090625svn.el5" ], [ "0:2.3.4-2.el5", - "0:2.3.4-2.el6" ] + "0:2.3.4-2.el6" ], ].each do |smaller, larger| sm = Chef::Provider::Package::Yum::RPMVersion.new(smaller) lg = Chef::Provider::Package::Yum::RPMVersion.new(larger) @@ -1128,7 +1128,7 @@ describe Chef::Provider::Package::Yum::RPMVersion do [ "0:1.9", "3:1.9" ], [ "2.3-2.el5", - "2.3-2.el6" ] + "2.3-2.el6" ], ].each do |smaller, larger| sm = Chef::Provider::Package::Yum::RPMVersion.new(smaller) lg = Chef::Provider::Package::Yum::RPMVersion.new(larger) @@ -1145,7 +1145,7 @@ describe Chef::Provider::Package::Yum::RPMVersion do [ "0:2.3-15.el5", "0:2.3-15.el5" ], [ "0:alpha9.8-27.2", - "0:alpha9.8-27.2" ] + "0:alpha9.8-27.2" ], ].each do |smaller, larger| sm = Chef::Provider::Package::Yum::RPMVersion.new(smaller) lg = Chef::Provider::Package::Yum::RPMVersion.new(larger) @@ -1160,7 +1160,7 @@ describe Chef::Provider::Package::Yum::RPMVersion do [ "2.3-15.el5", "2.3-15.el5" ], [ "alpha9.8-3", - "alpha9.8-3" ] + "alpha9.8-3" ], ].each do |smaller, larger| sm = Chef::Provider::Package::Yum::RPMVersion.new(smaller) lg = Chef::Provider::Package::Yum::RPMVersion.new(larger) @@ -1460,7 +1460,7 @@ describe Chef::Provider::Package::Yum::RPMDependency do [ "=", :== ], [ "==", :== ], [ "<=", :<= ], - [ "<", :< ] + [ "<", :< ], ].each do |before, after| @rpmdep = Chef::Provider::Package::Yum::RPMDependency.parse("testing #{before} 1:1.1-1") expect(@rpmdep.flag).to eq(after) @@ -1474,7 +1474,7 @@ describe Chef::Provider::Package::Yum::RPMDependency do [ ">>", :== ], [ "<<", :== ], [ "!", :== ], - [ "~", :== ] + [ "~", :== ], ].each do |before, after| @rpmdep = Chef::Provider::Package::Yum::RPMDependency.parse("testing #{before} 1:1.1-1") expect(@rpmdep.name).to eq("testing #{before} 1:1.1-1") @@ -1549,12 +1549,12 @@ describe Chef::Provider::Package::Yum::RPMDb do # name, version, arch, installed, available deps_v = [ Chef::Provider::Package::Yum::RPMDependency.parse("libz.so.1()(64bit)"), - Chef::Provider::Package::Yum::RPMDependency.parse("test-package-a = 0:1.6.5-9.36.el5") + Chef::Provider::Package::Yum::RPMDependency.parse("test-package-a = 0:1.6.5-9.36.el5"), ] deps_z = [ Chef::Provider::Package::Yum::RPMDependency.parse("libz.so.1()(64bit)"), Chef::Provider::Package::Yum::RPMDependency.parse("config(test) = 0:1.6.5-9.36.el5"), - Chef::Provider::Package::Yum::RPMDependency.parse("test-package-c = 0:1.6.5-9.36.el5") + Chef::Provider::Package::Yum::RPMDependency.parse("test-package-c = 0:1.6.5-9.36.el5"), ] @rpm_v = Chef::Provider::Package::Yum::RPMDbPackage.new("test-package-a", "0:1.6.5-9.36.el5", "i386", deps_v, true, false, "base") @rpm_w = Chef::Provider::Package::Yum::RPMDbPackage.new("test-package-b", "0:1.6.5-9.36.el5", "i386", [], true, true, "extras") @@ -2127,7 +2127,7 @@ describe "Chef::Provider::Package::Yum - Multi" do :version_available? => true, :allow_multi_install => [ 'kernel' ], :package_repository => 'base', - :disable_extra_repo_control => true + :disable_extra_repo_control => true, ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") diff --git a/spec/unit/provider/package_spec.rb b/spec/unit/provider/package_spec.rb index f77c2b5d0d..cf905aeab7 100644 --- a/spec/unit/provider/package_spec.rb +++ b/spec/unit/provider/package_spec.rb @@ -58,7 +58,7 @@ describe Chef::Provider::Package do new_resource.response_file("foo") expect(provider).to receive(:get_preseed_file).with( new_resource.name, - provider.candidate_version + provider.candidate_version, ).and_return("/var/cache/preseed-test") expect(provider).to receive(:preseed_package).with( @@ -75,7 +75,7 @@ describe Chef::Provider::Package do it "should install the package at the candidate_version if it is not already installed" do expect(provider).to receive(:install_package).with( new_resource.name, - provider.candidate_version + provider.candidate_version, ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -85,7 +85,7 @@ describe Chef::Provider::Package do new_resource.version("1.0") expect(provider).to receive(:install_package).with( new_resource.name, - new_resource.version + new_resource.version, ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -96,7 +96,7 @@ describe Chef::Provider::Package do allow(current_resource).to receive(:version).and_return("0.99") expect(provider).to receive(:install_package).with( new_resource.name, - new_resource.version + new_resource.version, ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -144,7 +144,7 @@ describe Chef::Provider::Package do it "should upgrade the package if the current version is not the candidate version" do expect(provider).to receive(:upgrade_package).with( new_resource.name, - provider.candidate_version + provider.candidate_version, ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action @@ -468,7 +468,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:install_package).with( [ "vim" ], - [ "1.0" ] + [ "1.0" ], ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -481,7 +481,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:install_package).with( [ "vim" ], - [ "1.0" ] + [ "1.0" ], ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -494,7 +494,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:upgrade_package).with( [ "vim" ], - [ "1.0" ] + [ "1.0" ], ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action @@ -507,7 +507,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:upgrade_package).with( [ "vim" ], - [ "1.0" ] + [ "1.0" ], ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action @@ -521,7 +521,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:remove_package).with( [ "vim" ], - [ nil ] + [ nil ], ).and_return(true) provider.run_action(:remove) expect(new_resource).to be_updated_by_last_action @@ -535,7 +535,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:purge_package).with( [ "vim" ], - [ nil ] + [ nil ], ).and_return(true) provider.run_action(:purge) expect(new_resource).to be_updated_by_last_action @@ -582,7 +582,7 @@ describe "Chef::Provider::Package - Multi" do it "installs the candidate versions when none are installed" do expect(provider).to receive(:install_package).with( ["emacs", "vi"], - ["1.0", "6.2"] + ["1.0", "6.2"], ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated @@ -591,7 +591,7 @@ describe "Chef::Provider::Package - Multi" do it "installs the candidate versions when some are installed" do expect(provider).to receive(:install_package).with( [ 'vi' ], - [ '6.2' ] + [ '6.2' ], ).and_return(true) current_resource.version(['1.0', nil]) provider.run_action(:install) @@ -675,7 +675,7 @@ describe "Chef::Provider::Package - Multi" do current_resource.version ['0.9', '6.1'] expect(provider).to receive(:upgrade_package).with( new_resource.package_name, - provider.candidate_version + provider.candidate_version, ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action @@ -685,7 +685,7 @@ describe "Chef::Provider::Package - Multi" do current_resource.version ['1.0', '6.1'] expect(provider).to receive(:upgrade_package).with( ["vi"], - ["6.2"] + ["6.2"], ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action diff --git a/spec/unit/provider/remote_file/content_spec.rb b/spec/unit/provider/remote_file/content_spec.rb index ce18d23a09..2639c39faa 100644 --- a/spec/unit/provider/remote_file/content_spec.rb +++ b/spec/unit/provider/remote_file/content_spec.rb @@ -180,7 +180,7 @@ describe Chef::Provider::RemoteFile::Content do Timeout::Error, Net::HTTPServerException, Net::HTTPFatalError, - Net::FTPError + Net::FTPError, ].each do |exception| describe "with an exception of #{exception}" do before do diff --git a/spec/unit/provider/service/debian_service_spec.rb b/spec/unit/provider/service/debian_service_spec.rb index a4667e8ce8..346e349db7 100644 --- a/spec/unit/provider/service/debian_service_spec.rb +++ b/spec/unit/provider/service/debian_service_spec.rb @@ -134,12 +134,12 @@ describe Chef::Provider::Service::Debian do "3"=>[:start, "20"], "4"=>[:start, "20"], "5"=>[:start, "20"], - "6"=>[:stop, "20"] - } + "6"=>[:stop, "20"], + }, }, "not linked" => { "stdout" => " Removing any system startup links for /etc/init.d/chef ...", - "stderr" => "" + "stderr" => "", }, }, "Debian/Squeeze and earlier" => { @@ -162,13 +162,13 @@ insserv: remove service /etc/init.d/../rc0.d/K20chef-client "3"=>[:start, "20"], "4"=>[:start, "20"], "5"=>[:start, "20"], - "6"=>[:stop, "20"] - } + "6"=>[:stop, "20"], + }, }, "not linked" => { "stdout" => "update-rc.d: using dependency based boot sequencing", - "stderr" => "" - } + "stderr" => "", + }, }, "Debian/Wheezy and earlier, a service only starting at run level S" => { "linked" => { @@ -184,14 +184,14 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop "0"=>[:stop, "06"], "1"=>[:stop, "06"], "6"=>[:stop, "06"], - "S"=>[:start, "13"] - } + "S"=>[:start, "13"], + }, }, "not linked" => { "stdout" => "", - "stderr" => "insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop" - } - } + "stderr" => "insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop", + }, + }, }.each do |model, expected_results| context "on #{model}" do context "when update-rc.d shows init linked to rc*.d/" do @@ -311,7 +311,7 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop it "calls update-rc.d 'service_name' defaults" do expect_commands(@provider, [ "/usr/sbin/update-rc.d -f #{service_name} remove", - "/usr/sbin/update-rc.d #{service_name} defaults" + "/usr/sbin/update-rc.d #{service_name} defaults", ]) @provider.enable_service end @@ -325,7 +325,7 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop it "calls update-rc.d 'service_name' defaults" do expect_commands(@provider, [ "/usr/sbin/update-rc.d -f #{service_name} remove", - "/usr/sbin/update-rc.d #{service_name} defaults 75 25" + "/usr/sbin/update-rc.d #{service_name} defaults 75 25", ]) @provider.enable_service end @@ -339,7 +339,7 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop it "calls update-rc.d 'service_name' with those priorities" do expect_commands(@provider, [ "/usr/sbin/update-rc.d -f #{service_name} remove", - "/usr/sbin/update-rc.d #{service_name} start 20 2 . stop 55 3 . " + "/usr/sbin/update-rc.d #{service_name} start 20 2 . stop 55 3 . ", ]) @provider.enable_service end @@ -352,7 +352,7 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop it "calls update-rc.d -f 'service_name' remove + stop with default priority" do expect_commands(@provider, [ "/usr/sbin/update-rc.d -f #{service_name} remove", - "/usr/sbin/update-rc.d -f #{service_name} stop 80 2 3 4 5 ." + "/usr/sbin/update-rc.d -f #{service_name} stop 80 2 3 4 5 .", ]) @provider.disable_service end @@ -366,7 +366,7 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop it "calls update-rc.d -f 'service_name' remove + stop with the specified priority" do expect_commands(@provider, [ "/usr/sbin/update-rc.d -f #{service_name} remove", - "/usr/sbin/update-rc.d -f #{service_name} stop #{100 - @new_resource.priority} 2 3 4 5 ." + "/usr/sbin/update-rc.d -f #{service_name} stop #{100 - @new_resource.priority} 2 3 4 5 .", ]) @provider.disable_service end diff --git a/spec/unit/provider/service/solaris_smf_service_spec.rb b/spec/unit/provider/service/solaris_smf_service_spec.rb index 62c3ac6c6e..4ff3e89ae3 100644 --- a/spec/unit/provider/service/solaris_smf_service_spec.rb +++ b/spec/unit/provider/service/solaris_smf_service_spec.rb @@ -42,7 +42,7 @@ describe Chef::Provider::Service::Solaris do 'logfile /var/svc/log/application-chef:default.log', 'restarter svc:/system/svc/restarter:default', 'contract_id 1115271', - 'dependency require_all/error svc:/milestone/multi-user:default (online)' + 'dependency require_all/error svc:/milestone/multi-user:default (online)', ].join("\n") # disabled / stopped service (svcs -l chef) @@ -56,7 +56,7 @@ describe Chef::Provider::Service::Solaris do 'logfile /var/svc/log/application-chef:default.log', 'restarter svc:/system/svc/restarter:default', 'contract_id 1115271', - 'dependency require_all/error svc:/milestone/multi-user:default (online)' + 'dependency require_all/error svc:/milestone/multi-user:default (online)', ].join("\n") # disabled / stopped service (svcs -l chef) @@ -70,7 +70,7 @@ describe Chef::Provider::Service::Solaris do 'logfile /var/svc/log/application-chef:default.log', 'restarter svc:/system/svc/restarter:default', 'contract_id 1115271', - 'dependency require_all/error svc:/milestone/multi-user:default (online)' + 'dependency require_all/error svc:/milestone/multi-user:default (online)', ].join("\n") # shell_out! return value for a service that is running diff --git a/spec/unit/provider/user/pw_spec.rb b/spec/unit/provider/user/pw_spec.rb index b225972e87..6683a75f42 100644 --- a/spec/unit/provider/user/pw_spec.rb +++ b/spec/unit/provider/user/pw_spec.rb @@ -52,7 +52,7 @@ describe Chef::Provider::User::Pw do 'home' => "-d", 'gid' => "-g", 'uid' => "-u", - 'shell' => "-s" + 'shell' => "-s", } field_list.each do |attribute, option| it "should check for differences in #{attribute} between the new and current resources" do diff --git a/spec/unit/provider/user/useradd_spec.rb b/spec/unit/provider/user/useradd_spec.rb index b9f6ee0d86..a295dff679 100644 --- a/spec/unit/provider/user/useradd_spec.rb +++ b/spec/unit/provider/user/useradd_spec.rb @@ -34,7 +34,7 @@ describe Chef::Provider::User::Useradd do 'gid' => "-g", 'uid' => "-u", 'shell' => "-s", - 'password' => "-p" + 'password' => "-p", } include_examples "a useradd-based user provider", supported_useradd_options diff --git a/spec/unit/provider/user_spec.rb b/spec/unit/provider/user_spec.rb index bd24a6a01e..c38abcc049 100644 --- a/spec/unit/provider/user_spec.rb +++ b/spec/unit/provider/user_spec.rb @@ -114,7 +114,7 @@ describe Chef::Provider::User do :gid => :gid, :comment => :gecos, :home => :dir, - :shell => :shell + :shell => :shell, } user_attrib_map.each do |user_attrib, getpwnam_attrib| it "should set the current resources #{user_attrib} based on getpwnam #{getpwnam_attrib}" do @@ -198,7 +198,7 @@ describe Chef::Provider::User do 'gid' => [1000, 1001], 'home' => ["/home/adam", "/Users/adam"], 'shell'=> ["/usr/bin/zsh", "/bin/bash"], - 'password'=> ["abcd","12345"] + 'password'=> ["abcd","12345"], } } -- cgit v1.2.1