Add --no-listen option to disable zero binding to port

3 files changed, 26 insertions, 0 deletions

diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb
index aa9aefe1a7..b5c5e12781 100644
--- a/spec/integration/client/client_spec.rb
+++ b/spec/integration/client/client_spec.rb
@@ -60,6 +60,17 @@ EOM
       result.error!
     end
 
+    it "should complete successfully with --no-listen" do
+      file 'config/client.rb', <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+
+      result = shell_out("#{chef_client} --no-listen -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
+      result.error!
+    end
+
+
     context 'and no config file' do
       it 'should complete with success when cwd is just above cookbooks and paths are not specified' do
         result = shell_out("#{chef_client} -z -o 'x::default' --disable-config", :cwd => path_to(''))
diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb
index 501251b7fe..c753ca0ab8 100644
--- a/spec/unit/application/client_spec.rb
+++ b/spec/unit/application/client_spec.rb
@@ -131,6 +131,16 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
 
   end
 
+  describe "when --no-listen is set" do
+
+    it "configures listen = false" do
+      app.config[:listen] = false
+      app.reconfigure
+      expect(Chef::Config[:listen]).to eq(false)
+    end
+
+  end
+
   describe "when the json_attribs configuration option is specified" do
 
     let(:json_attribs) { {"a" => "b"} }
diff --git a/spec/unit/knife_spec.rb b/spec/unit/knife_spec.rb
index 2ccf8493ad..b748232081 100644
--- a/spec/unit/knife_spec.rb
+++ b/spec/unit/knife_spec.rb
@@ -271,6 +271,11 @@ describe Chef::Knife do
         expect(knife_command.config[:opt_with_default]).to eq("from-cli")
       end
 
+      it "merges `listen` config to Chef::Config" do
+        Chef::Knife.run(%w[test yourself --no-listen], Chef::Application::Knife.options)
+        expect(Chef::Config[:listen]).to be(false)
+      end
+
       context "verbosity is greater than zero" do
         let(:fake_config) { "/does/not/exist/knife.rb" }