React to fact that we bind chef-zero to localhost (not 127.*)

5 files changed, 14 insertions, 14 deletions

diff --git a/spec/integration/knife/chef_fs_data_store_spec.rb b/spec/integration/knife/chef_fs_data_store_spec.rb
index 3bbe38fcc6..13d413a7c8 100644
--- a/spec/integration/knife/chef_fs_data_store_spec.rb
+++ b/spec/integration/knife/chef_fs_data_store_spec.rb
@@ -105,7 +105,7 @@ EOM
         knife('show -z /clients/x.json').should_succeed /"x"/
       end
 
-      it 'knife show -z /cookbooks/x/metadata.rb works' do
+      it 'knife show -z /cookbooks/x/metadata.rb works', :focus do
         knife('show -z /cookbooks/x/metadata.rb').should_succeed "/cookbooks/x/metadata.rb:\nversion \"1.0.0\"\n"
       end
 
diff --git a/spec/integration/knife/common_options_spec.rb b/spec/integration/knife/common_options_spec.rb
index 6de4d9360b..00e3131ed4 100644
--- a/spec/integration/knife/common_options_spec.rb
+++ b/spec/integration/knife/common_options_spec.rb
@@ -37,16 +37,16 @@ describe 'knife common options' do
         Chef::Config.chef_zero.enabled = true
       end
 
-      it 'knife raw /nodes/x should retrieve the role' do
+      it 'knife raw /nodes/x should retrieve the node' do
         knife('raw /nodes/x').should_succeed /"name": "x"/
       end
 
       context 'And chef_zero.port is 9999' do
         before(:each) { Chef::Config.chef_zero.port = 9999 }
- 
-        it 'knife raw /nodes/x should retrieve the role' do
+
+        it 'knife raw /nodes/x should retrieve the node' do
           knife('raw /nodes/x').should_succeed /"name": "x"/
-          Chef::Config.chef_server_url.should == 'http://127.0.0.1:9999'
+          Chef::Config.chef_server_url.should == 'http://localhost:9999'
         end
       end
 
@@ -81,23 +81,23 @@ syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
 -----END RSA PRIVATE KEY-----
 EOM
 
-        it 'knife raw /nodes/x should retrieve the role' do
+        it 'knife raw /nodes/x should retrieve the node' do
           knife('raw /nodes/x').should_succeed /"name": "x"/
         end
       end
     end
 
-    it 'knife raw -z /nodes/x retrieves the role' do
+    it 'knife raw -z /nodes/x retrieves the node' do
       knife('raw -z /nodes/x').should_succeed /"name": "x"/
     end
 
-    it 'knife raw --local-mode /nodes/x retrieves the role' do
+    it 'knife raw --local-mode /nodes/x retrieves the node' do
       knife('raw --local-mode /nodes/x').should_succeed /"name": "x"/
     end
 
-    it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the role' do
+    it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node' do
       knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed /"name": "x"/
-      Chef::Config.chef_server_url.should == 'http://127.0.0.1:9999'
+      Chef::Config.chef_server_url.should == 'http://localhost:9999'
     end
   end
 end
diff --git a/spec/integration/knife/raw_spec.rb b/spec/integration/knife/raw_spec.rb
index fafd0a47ee..c2ef02175b 100644
--- a/spec/integration/knife/raw_spec.rb
+++ b/spec/integration/knife/raw_spec.rb
@@ -166,7 +166,7 @@ EOM
 
     context 'When a server returns raw json' do
       before :each do
-        Chef::Config.chef_server_url = "http://127.0.0.1:9018"
+        Chef::Config.chef_server_url = "http://localhost:9018"
         app = lambda do |env|
           [200, {'Content-Type' => 'application/json' }, ['{ "x": "y", "a": "b" }'] ]
         end
@@ -196,7 +196,7 @@ EOM
 
     context 'When a server returns text' do
       before :each do
-        Chef::Config.chef_server_url = "http://127.0.0.1:9018"
+        Chef::Config.chef_server_url = "http://localhost:9018"
         app = lambda do |env|
           [200, {'Content-Type' => 'text' }, ['{ "x": "y", "a": "b" }'] ]
         end
diff --git a/spec/integration/knife/redirection_spec.rb b/spec/integration/knife/redirection_spec.rb
index 2ed49a7b24..b92e3252c7 100644
--- a/spec/integration/knife/redirection_spec.rb
+++ b/spec/integration/knife/redirection_spec.rb
@@ -29,7 +29,7 @@ describe 'redirection' do
     context 'and another server redirects to it with 302' do
       before :each do
         real_chef_server_url = Chef::Config.chef_server_url
-        Chef::Config.chef_server_url = "http://127.0.0.1:9018"
+        Chef::Config.chef_server_url = "http://localhost:9018"
         app = lambda do |env|
           [302, {'Content-Type' => 'text','Location' => "#{real_chef_server_url}#{env['PATH_INFO']}" }, ['302 found'] ]
         end
diff --git a/spec/integration/knife/serve_spec.rb b/spec/integration/knife/serve_spec.rb
index ef6990e434..6f8d046518 100644
--- a/spec/integration/knife/serve_spec.rb
+++ b/spec/integration/knife/serve_spec.rb
@@ -38,7 +38,7 @@ describe 'knife serve' do
       end
       begin
         Chef::Config.log_level = :debug
-        Chef::Config.chef_server_url = 'http://127.0.0.1:8889'
+        Chef::Config.chef_server_url = 'http://localhost:8889'
         Chef::Config.node_name = nil
         Chef::Config.client_key = nil
         api = Chef::ServerAPI.new