From 4f4242f0840dd369b873ed0a3e79ca71dc41a138 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 17 Nov 2014 14:45:24 -0800 Subject: stop recomputing locale -a constantly fixes an outstanding issue on the locale -a guessing also fixes perf issues in the rspec tests (e.g. deploy provider) --- spec/unit/config_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec') diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb index cc83ca3c45..5e4c610bc0 100644 --- a/spec/unit/config_spec.rb +++ b/spec/unit/config_spec.rb @@ -434,7 +434,7 @@ describe Chef::Config do expect(Chef::Log).to_not receive(:warn).with(/Please install an English UTF-8 locale for Chef to use/) expect(Chef::Log).to_not receive(:debug).with(/Defaulting to locale en_US.UTF-8 on Windows/) expect(Chef::Log).to_not receive(:debug).with(/No usable locale -a command found/) - expect(Chef::Config[:internal_locale]).to eq expected_locale + expect(Chef::Config.guess_internal_locale).to eq expected_locale end end @@ -485,7 +485,7 @@ describe Chef::Config do it "should fall back to C locale" do expect(Chef::Log).to receive(:warn).with("Please install an English UTF-8 locale for Chef to use, falling back to C locale and disabling UTF-8 support.") - expect(Chef::Config[:internal_locale]).to eq 'C' + expect(Chef::Config.guess_internal_locale).to eq 'C' end end @@ -502,7 +502,7 @@ describe Chef::Config do else expect(Chef::Log).to receive(:debug).with("No usable locale -a command found, assuming you have en_US.UTF-8 installed.") end - expect(Chef::Config[:internal_locale]).to eq "en_US.UTF-8" + expect(Chef::Config.guess_internal_locale).to eq "en_US.UTF-8" end end end -- cgit v1.2.1