chef 14.14.29-universal-mingw32 → 14.15.6-universal-mingw32

data/spec/unit/knife/role_edit_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Knife::RoleEdit do
     @knife.config[:print_after] = nil
     @knife.name_args = [ "adam" ]
     allow(@knife.ui).to receive(:output).and_return(true)
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     allow(@role).to receive(:save)
     allow(Chef::Role).to receive(:load).and_return(@role)
     allow(@knife.ui).to receive(:edit_data).and_return(@role)

data/spec/unit/knife/role_env_run_list_add_spec.rb

@@ -29,7 +29,7 @@ describe Chef::Knife::RoleEnvRunListAdd do
     }
     @knife.name_args = [ "will", "QA", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     allow(@role).to receive(:save).and_return(true)
     allow(Chef::Role).to receive(:load).and_return(@role)
   end

data/spec/unit/knife/role_env_run_list_clear_spec.rb

@@ -33,7 +33,7 @@ describe Chef::Knife::RoleEnvRunListClear do
     @knife.name_args = %w{will QA}
     allow(@knife).to receive(:output).and_return(true)
 
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     @role.name("will")
     allow(@role).to receive(:save).and_return(true)
 

data/spec/unit/knife/role_env_run_list_remove_spec.rb

@@ -33,7 +33,7 @@ describe Chef::Knife::RoleEnvRunListRemove do
     @knife.name_args = [ "will", "QA", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)
 
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     @role.name("will")
     allow(@role).to receive(:save).and_return(true)
 

data/spec/unit/knife/role_env_run_list_replace_spec.rb

@@ -33,7 +33,7 @@ describe Chef::Knife::RoleEnvRunListReplace do
     @knife.name_args = [ "will", "QA", "role[dude]", "role[person]" ]
     allow(@knife).to receive(:output).and_return(true)
 
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     @role.name("will")
     allow(@role).to receive(:save).and_return(true)
 

data/spec/unit/knife/role_env_run_list_set_spec.rb

@@ -33,7 +33,7 @@ describe Chef::Knife::RoleEnvRunListSet do
     @knife.name_args = [ "will", "QA", "role[owen]", "role[mauntel]" ]
     allow(@knife).to receive(:output).and_return(true)
 
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     @role.name("will")
     allow(@role).to receive(:save).and_return(true)
 

data/spec/unit/knife/role_from_file_spec.rb

@@ -30,7 +30,7 @@ describe Chef::Knife::RoleFromFile do
     @knife.name_args = [ "adam.rb" ]
     allow(@knife).to receive(:output).and_return(true)
     allow(@knife).to receive(:confirm).and_return(true)
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     allow(@role).to receive(:save)
     allow(@knife.loader).to receive(:load_from).and_return(@role)
     @stdout = StringIO.new

data/spec/unit/knife/role_run_list_add_spec.rb

@@ -29,7 +29,7 @@ describe Chef::Knife::RoleRunListAdd do
     }
     @knife.name_args = [ "will", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     allow(@role).to receive(:save).and_return(true)
     allow(Chef::Role).to receive(:load).and_return(@role)
   end

data/spec/unit/knife/role_run_list_clear_spec.rb

@@ -32,7 +32,7 @@ describe Chef::Knife::RoleRunListClear do
     @knife.name_args = [ "will" ]
     allow(@knife).to receive(:output).and_return(true)
 
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     @role.name("will")
     allow(@role).to receive(:save).and_return(true)
 

data/spec/unit/knife/role_run_list_remove_spec.rb

@@ -32,7 +32,7 @@ describe Chef::Knife::RoleRunListRemove do
     @knife.name_args = [ "will", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)
 
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     @role.name("will")
     allow(@role).to receive(:save).and_return(true)
 

data/spec/unit/knife/role_run_list_replace_spec.rb

@@ -32,7 +32,7 @@ describe Chef::Knife::RoleRunListReplace do
     @knife.name_args = [ "will", "role[dude]", "role[person]" ]
     allow(@knife).to receive(:output).and_return(true)
 
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     @role.name("will")
     allow(@role).to receive(:save).and_return(true)
 

data/spec/unit/knife/role_run_list_set_spec.rb

@@ -32,7 +32,7 @@ describe Chef::Knife::RoleRunListSet do
     @knife.name_args = [ "will", "role[owen]", "role[mauntel]" ]
     allow(@knife).to receive(:output).and_return(true)
 
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     @role.name("will")
     allow(@role).to receive(:save).and_return(true)
 

data/spec/unit/knife/ssh_spec.rb

@@ -360,29 +360,39 @@ describe Chef::Knife::Ssh do
   end
 
   describe "#run" do
-    before do
-      @query = Chef::Search::Query.new
-      expect(@query).to receive(:search).and_yield(@node_foo)
-      allow(Chef::Search::Query).to receive(:new).and_return(@query)
-      allow(@knife).to receive(:ssh_command).and_return(exit_code)
-      @knife.name_args = ["*:*", "false"]
+
+    it "should print usage and exit when a SEARCH QUERY is not provided" do
+      @knife.name_args = []
+      expect(@knife).to receive(:show_usage)
+      expect(@knife.ui).to receive(:fatal).with(/You must specify the SEARCH QUERY./)
+      expect { @knife.run }.to raise_error(SystemExit)
     end
 
-    context "with an error" do
-      let(:exit_code) { 1 }
+    context "exit" do
+      before do
+        @query = Chef::Search::Query.new
+        expect(@query).to receive(:search).and_yield(@node_foo)
+        allow(Chef::Search::Query).to receive(:new).and_return(@query)
+        allow(@knife).to receive(:ssh_command).and_return(exit_code)
+        @knife.name_args = ["*:*", "false"]
+      end
+
+      context "with an error" do
+        let(:exit_code) { 1 }
 
-      it "should exit with a non-zero exit code" do
-        expect(@knife).to receive(:exit).with(exit_code)
-        @knife.run
+        it "should exit with a non-zero exit code" do
+          expect(@knife).to receive(:exit).with(exit_code)
+          @knife.run
+        end
       end
-    end
 
-    context "with no error" do
-      let(:exit_code) { 0 }
+      context "with no error" do
+        let(:exit_code) { 0 }
 
-      it "should not exit" do
-        expect(@knife).not_to receive(:exit)
-        @knife.run
+        it "should not exit" do
+          expect(@knife).not_to receive(:exit)
+          @knife.run
+        end
       end
     end
   end

data/spec/unit/knife/ssl_check_spec.rb

@@ -69,10 +69,10 @@ describe Chef::Knife::SslCheck do
       expect { ssl_check.run }.to raise_error(SystemExit)
       expected_stdout = <<~E
         USAGE: knife ssl check [URL] (options)
-E
+      E
       expected_stderr = <<~E
         ERROR: Given URI: `foo.test' is invalid
-E
+      E
       expect(stdout_io.string).to eq(expected_stdout)
       expect(stderr_io.string).to eq(expected_stderr)
     end
@@ -85,10 +85,10 @@ E
         expect { ssl_check.run }.to raise_error(SystemExit)
         expected_stdout = <<~E
           USAGE: knife ssl check [URL] (options)
-E
+        E
         expected_stderr = <<~E
           ERROR: Given URI: `#{name_args[0]}' is invalid
-E
+        E
         expect(stdout_io.string).to eq(expected_stdout)
         expect(stderr_io.string).to eq(expected_stderr)
       end

data/spec/unit/knife/ssl_fetch_spec.rb

@@ -70,10 +70,10 @@ describe Chef::Knife::SslFetch do
       expect { ssl_fetch.run }.to raise_error(SystemExit)
       expected_stdout = <<~E
         USAGE: knife ssl fetch [URL] (options)
-E
+      E
       expected_stderr = <<~E
         ERROR: Given URI: `foo.test' is invalid
-E
+      E
       expect(stdout_io.string).to eq(expected_stdout)
       expect(stderr_io.string).to eq(expected_stderr)
     end
@@ -86,10 +86,10 @@ E
         expect { ssl_fetch.run }.to raise_error(SystemExit)
         expected_stdout = <<~E
           USAGE: knife ssl fetch [URL] (options)
-E
+        E
         expected_stderr = <<~E
           ERROR: Given URI: `#{name_args[0]}' is invalid
-E
+        E
         expect(stdout_io.string).to eq(expected_stdout)
         expect(stderr_io.string).to eq(expected_stderr)
       end
@@ -190,7 +190,7 @@ E
         expected_error_text = <<~ERROR_TEXT
           ERROR: The service at the given URI (http://foo.example.com) does not accept SSL connections
           ERROR: Perhaps you meant to connect to 'https://foo.example.com'?
-ERROR_TEXT
+        ERROR_TEXT
 
         run
         expect(stderr).to include(expected_error_text)

data/spec/unit/knife/status_spec.rb

@@ -30,7 +30,7 @@ describe Chef::Knife::Status do
     @query = double("Chef::Search::Query")
     allow(@query).to receive(:search).and_yield(node)
     allow(Chef::Search::Query).to receive(:new).and_return(@query)
-    @knife  = Chef::Knife::Status.new
+    @knife = Chef::Knife::Status.new
     @stdout = StringIO.new
     allow(@knife.ui).to receive(:stdout).and_return(@stdout)
   end
@@ -40,7 +40,8 @@ describe Chef::Knife::Status do
       { filter_result:
                  { name: ["name"], ipaddress: ["ipaddress"], ohai_time: ["ohai_time"],
                    ec2: ["ec2"], run_list: ["run_list"], platform: ["platform"],
-                   platform_version: ["platform_version"], chef_environment: ["chef_environment"] } } end
+                   platform_version: ["platform_version"], chef_environment: ["chef_environment"] } }
+    end
 
     it "should default to searching for everything" do
       expect(@query).to receive(:search).with(:node, "*:*", opts)

data/spec/unit/knife/supermarket_download_spec.rb

@@ -31,8 +31,8 @@ describe Chef::Knife::SupermarketDownload do
       @cookbook_api_url = "https://supermarket.chef.io/api/v1/cookbooks"
       @version          = "1.0.2"
       @version_us       = @version.tr ".", "_"
-      @current_data     = { "deprecated"       => false,
-                            "latest_version"   => "#{@cookbook_api_url}/apache2/versions/#{@version_us}",
+      @current_data     = { "deprecated" => false,
+                            "latest_version" => "#{@cookbook_api_url}/apache2/versions/#{@version_us}",
                             "replacement" => "other_apache2" }
 
       allow(@knife.ui).to receive(:stderr).and_return(@stderr)
@@ -60,7 +60,7 @@ describe Chef::Knife::SupermarketDownload do
     context "when" do
       before do
         @cookbook_data = { "version" => @version,
-                           "file"    => "http://example.com/apache2_#{@version_us}.tgz" }
+                           "file" => "http://example.com/apache2_#{@version_us}.tgz" }
         @temp_file     = double( path: "/tmp/apache2_#{@version_us}.tgz" )
         @file          = File.join(Dir.pwd, "apache2-#{@version}.tar.gz")
       end
@@ -125,7 +125,7 @@ describe Chef::Knife::SupermarketDownload do
           @version         = "1.0.1"
           @version_us      = @version.tr ".", "_"
           @cookbook_data   = { "version" => @version,
-                               "file"    => "http://example.com/apache2_#{@version_us}.tgz" }
+                               "file" => "http://example.com/apache2_#{@version_us}.tgz" }
           @temp_file       = double(path: "/tmp/apache2_#{@version_us}.tgz")
           @file            = File.join(Dir.pwd, "apache2-#{@version}.tar.gz")
           @knife.name_args << @version

data/spec/unit/knife/supermarket_install_spec.rb

@@ -23,12 +23,13 @@ describe Chef::Knife::SupermarketInstall do
   let(:knife) { Chef::Knife::SupermarketInstall.new }
   let(:stdout) { StringIO.new }
   let(:stderr) { StringIO.new }
-  let(:downloader) { Hash.new }
+  let(:downloader) { {} }
   let(:archive) { double(Mixlib::Archive, extract: true) }
   let(:repo) do
     double(sanity_check: true, reset_to_default_state: true,
            prepare_to_import: true, finalize_updates_to: true,
-           merge_updates_from: true) end
+           merge_updates_from: true)
+  end
   let(:install_path) do
     if Chef::Platform.windows?
       "C:/tmp/chef"
@@ -81,7 +82,7 @@ describe Chef::Knife::SupermarketInstall do
     end
 
     it "raises an error if the second argument is not a version" do
-      knife.name_args = ["getting-started", "1pass"]
+      knife.name_args = %w{getting-started 1pass}
       expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
       expect { knife.run }.to raise_error(SystemExit)
     end
@@ -93,7 +94,7 @@ describe Chef::Knife::SupermarketInstall do
     end
 
     it "raises an error if the second argument is a one-digit version" do
-      knife.name_args = ["getting-started", "1"]
+      knife.name_args = %w{getting-started 1}
       expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
       expect { knife.run }.to raise_error(SystemExit)
     end

data/spec/unit/knife/supermarket_share_spec.rb

@@ -175,7 +175,7 @@ describe Chef::Knife::SupermarketShare do
       response_text = Chef::JSONCompat.to_json({ uri: "https://supermarket.chef.io/cookbooks/cookbook_name" })
       allow(@upload_response).to receive(:body).and_return(response_text)
       allow(@upload_response).to receive(:code).and_return(201)
-      expect(Chef::CookbookSiteStreamingUploader).to receive(:post).with(/supermarket\.chef\.io/, anything(), anything(), anything())
+      expect(Chef::CookbookSiteStreamingUploader).to receive(:post).with(/supermarket\.chef\.io/, anything, anything, anything)
       @knife.run
     end
 

data/spec/unit/knife_spec.rb

@@ -35,9 +35,9 @@ describe Chef::Knife do
 
   let(:config_loader) do
     instance_double("WorkstationConfigLoader",
-                    load: nil, no_config_found?: false,
-                    config_location: config_location,
-                    chef_config_dir: "/etc/chef")
+      load: nil, no_config_found?: false,
+      config_location: config_location,
+      chef_config_dir: "/etc/chef")
   end
 
   before(:each) do
@@ -55,7 +55,7 @@ describe Chef::Knife do
     allow(knife.ui).to receive(:print)
     allow(Chef::Log).to receive(:init)
     allow(Chef::Log).to receive(:level)
-    [:debug, :info, :warn, :error, :crit].each do |level_sym|
+    %i{debug info warn error crit}.each do |level_sym|
       allow(Chef::Log).to receive(level_sym)
     end
     allow(Chef::Knife).to receive(:puts)
@@ -166,7 +166,8 @@ describe Chef::Knife do
         "X-Chef-Version" => Chef::VERSION,
         "Host" => "api.opscode.piab",
         "X-REMOTE-REQUEST-ID" => request_id,
-    } end
+    }
+    end
 
     let(:request_id) { "1234" }
 
@@ -205,7 +206,7 @@ describe Chef::Knife do
         KnifeSpecs.send :remove_const, :TestYourself
       end
       Kernel.load(File.join(CHEF_SPEC_DATA, "knife_subcommand", "test_yourself.rb"))
-      Chef::Knife.subcommands.each { |name, klass| Chef::Knife.subcommands.delete(name) unless klass.kind_of?(Class) }
+      Chef::Knife.subcommands.each { |name, klass| Chef::Knife.subcommands.delete(name) unless klass.is_a?(Class) }
     end
 
     it "confirms that the headers include X-Remote-Request-Id" do
@@ -220,7 +221,7 @@ describe Chef::Knife do
         KnifeSpecs.send :remove_const, :TestYourself
       end
       Kernel.load(File.join(CHEF_SPEC_DATA, "knife_subcommand", "test_yourself.rb"))
-      Chef::Knife.subcommands.each { |name, klass| Chef::Knife.subcommands.delete(name) unless klass.kind_of?(Class) }
+      Chef::Knife.subcommands.each { |name, klass| Chef::Knife.subcommands.delete(name) unless klass.is_a?(Class) }
     end
 
     it "merges the global knife CLI options" do
@@ -283,8 +284,8 @@ describe Chef::Knife do
     describe "merging configuration options" do
       before do
         KnifeSpecs::TestYourself.option(:opt_with_default,
-                                        short: "-D VALUE",
-                                        default: "default-value")
+          short: "-D VALUE",
+          default: "default-value")
       end
 
       it "sets the default log_location to STDERR for Chef::Log warnings" do
@@ -440,8 +441,8 @@ describe Chef::Knife do
       allow(knife).to receive(:run).and_raise(Net::HTTPClientException.new("403 Forbidden", response))
       allow(knife).to receive(:username).and_return("sadpanda")
       knife.run_with_pretty_exceptions
-      expect(stderr.string).to match(%r{ERROR: You authenticated successfully to http.+ as sadpanda but you are not authorized for this action})
-      expect(stderr.string).to match(%r{Response:  y u no administrator})
+      expect(stderr.string).to match(/ERROR: You authenticated successfully to http.+ as sadpanda but you are not authorized for this action/)
+      expect(stderr.string).to match(/Response:  y u no administrator/)
     end
 
     context "when proxy servers are set" do
@@ -460,9 +461,9 @@ describe Chef::Knife do
         allow(knife).to receive(:run).and_raise(Net::HTTPClientException.new("403 Forbidden", response))
         allow(knife).to receive(:username).and_return("sadpanda")
         knife.run_with_pretty_exceptions
-        expect(stderr.string).to match(%r{ERROR: You authenticated successfully to http.+ as sadpanda but you are not authorized for this action})
-        expect(stderr.string).to match(%r{ERROR: There are proxy servers configured, your Chef server may need to be added to NO_PROXY.})
-        expect(stderr.string).to match(%r{Response:  y u no administrator})
+        expect(stderr.string).to match(/ERROR: You authenticated successfully to http.+ as sadpanda but you are not authorized for this action/)
+        expect(stderr.string).to match(/ERROR: There are proxy servers configured, your Chef server may need to be added to NO_PROXY./)
+        expect(stderr.string).to match(/Response:  y u no administrator/)
       end
     end
 
@@ -472,8 +473,8 @@ describe Chef::Knife do
       allow(response).to receive(:body).and_return(Chef::JSONCompat.to_json(error: "y u search wrong"))
       allow(knife).to receive(:run).and_raise(Net::HTTPClientException.new("400 Bad Request", response))
       knife.run_with_pretty_exceptions
-      expect(stderr.string).to match(%r{ERROR: The data in your request was invalid})
-      expect(stderr.string).to match(%r{Response: y u search wrong})
+      expect(stderr.string).to match(/ERROR: The data in your request was invalid/)
+      expect(stderr.string).to match(/Response: y u search wrong/)
     end
 
     it "formats 404s nicely" do
@@ -482,8 +483,8 @@ describe Chef::Knife do
       allow(response).to receive(:body).and_return(Chef::JSONCompat.to_json(error: "nothing to see here"))
       allow(knife).to receive(:run).and_raise(Net::HTTPClientException.new("404 Not Found", response))
       knife.run_with_pretty_exceptions
-      expect(stderr.string).to match(%r{ERROR: The object you are looking for could not be found})
-      expect(stderr.string).to match(%r{Response: nothing to see here})
+      expect(stderr.string).to match(/ERROR: The object you are looking for could not be found/)
+      expect(stderr.string).to match(/Response: nothing to see here/)
     end
 
     it "formats 406s (non-supported API version error) nicely" do
@@ -508,8 +509,8 @@ describe Chef::Knife do
       allow(response).to receive(:body).and_return(Chef::JSONCompat.to_json(error: "sad trombone"))
       allow(knife).to receive(:run).and_raise(Net::HTTPFatalError.new("500 Internal Server Error", response))
       knife.run_with_pretty_exceptions
-      expect(stderr.string).to match(%r{ERROR: internal server error})
-      expect(stderr.string).to match(%r{Response: sad trombone})
+      expect(stderr.string).to match(/ERROR: internal server error/)
+      expect(stderr.string).to match(/Response: sad trombone/)
     end
 
     it "formats 502s nicely" do
@@ -518,8 +519,8 @@ describe Chef::Knife do
       allow(response).to receive(:body).and_return(Chef::JSONCompat.to_json(error: "sadder trombone"))
       allow(knife).to receive(:run).and_raise(Net::HTTPFatalError.new("502 Bad Gateway", response))
       knife.run_with_pretty_exceptions
-      expect(stderr.string).to match(%r{ERROR: bad gateway})
-      expect(stderr.string).to match(%r{Response: sadder trombone})
+      expect(stderr.string).to match(/ERROR: bad gateway/)
+      expect(stderr.string).to match(/Response: sadder trombone/)
     end
 
     it "formats 503s nicely" do
@@ -528,8 +529,8 @@ describe Chef::Knife do
       allow(response).to receive(:body).and_return(Chef::JSONCompat.to_json(error: "saddest trombone"))
       allow(knife).to receive(:run).and_raise(Net::HTTPFatalError.new("503 Service Unavailable", response))
       knife.run_with_pretty_exceptions
-      expect(stderr.string).to match(%r{ERROR: Service temporarily unavailable})
-      expect(stderr.string).to match(%r{Response: saddest trombone})
+      expect(stderr.string).to match(/ERROR: Service temporarily unavailable/)
+      expect(stderr.string).to match(/Response: saddest trombone/)
     end
 
     it "formats other HTTP errors nicely" do
@@ -538,16 +539,16 @@ describe Chef::Knife do
       allow(response).to receive(:body).and_return(Chef::JSONCompat.to_json(error: "nobugfixtillyoubuy"))
       allow(knife).to receive(:run).and_raise(Net::HTTPClientException.new("402 Payment Required", response))
       knife.run_with_pretty_exceptions
-      expect(stderr.string).to match(%r{ERROR: Payment Required})
-      expect(stderr.string).to match(%r{Response: nobugfixtillyoubuy})
+      expect(stderr.string).to match(/ERROR: Payment Required/)
+      expect(stderr.string).to match(/Response: nobugfixtillyoubuy/)
     end
 
     it "formats NameError and NoMethodError nicely" do
       allow(knife).to receive(:run).and_raise(NameError.new("Undefined constant FUUU"))
       knife.run_with_pretty_exceptions
-      expect(stderr.string).to match(%r{ERROR: knife encountered an unexpected error})
-      expect(stderr.string).to match(%r{This may be a bug in the 'knife' knife command or plugin})
-      expect(stderr.string).to match(%r{Exception: NameError: Undefined constant FUUU})
+      expect(stderr.string).to match(/ERROR: knife encountered an unexpected error/)
+      expect(stderr.string).to match(/This may be a bug in the 'knife' knife command or plugin/)
+      expect(stderr.string).to match(/Exception: NameError: Undefined constant FUUU/)
     end
 
     it "formats missing private key errors nicely" do
@@ -555,7 +556,7 @@ describe Chef::Knife do
       allow(knife).to receive(:api_key).and_return("/home/root/.chef/no-key-here.pem")
       knife.run_with_pretty_exceptions
       expect(stderr.string).to match(%r{ERROR: Your private key could not be loaded from /home/root/.chef/no-key-here.pem})
-      expect(stderr.string).to match(%r{Check your configuration file and ensure that your private key is readable})
+      expect(stderr.string).to match(/Check your configuration file and ensure that your private key is readable/)
     end
 
     it "formats connection refused errors nicely" do
@@ -564,8 +565,8 @@ describe Chef::Knife do
       # Errno::ECONNREFUSED message differs by platform
       # *nix = Errno::ECONNREFUSED: Connection refused
       # win32: Errno::ECONNREFUSED: No connection could be made because the target machine actively refused it.
-      expect(stderr.string).to match(%r{ERROR: Network Error: .* - y u no shut up})
-      expect(stderr.string).to match(%r{Check your knife configuration and network settings})
+      expect(stderr.string).to match(/ERROR: Network Error: .* - y u no shut up/)
+      expect(stderr.string).to match(/Check your knife configuration and network settings/)
     end
 
     it "formats SSL errors nicely and suggests to use `knife ssl check` and `knife ssl fetch`" do
@@ -579,7 +580,7 @@ describe Chef::Knife do
         Use `knife ssl check` to troubleshoot your SSL configuration.
         If your Chef Server uses a self-signed certificate, you can use
         `knife ssl fetch` to make knife trust the server's certificates.
-MSG
+      MSG
       expect(stderr.string).to include(expected_message)
     end