Merge pull request #5 from rightscale-cookbooks/white_14_02_acu128798…

…_hostname_fix_to_support_centos Update how we get the hostname to support CentOS kitchen tests
rightscale-cookbooks · Feb 25, 2014 · 9246ad3 · 9246ad3
2 parents ec71651 + bf12b38
commit 9246ad3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/test/integration/application/serverspec/server_spec.rb b/test/integration/application/serverspec/server_spec.rb
@@ -3,7 +3,7 @@
 require 'socket'
 
 describe "Application LWRP" do
-  let(:host_name) { Socket.gethostname }
+  let(:host_name) { Socket.gethostname.split('.').first }
   let(:app_tags) { MachineTag::Set.new(JSON.parse(IO.read("/vagrant/cache_dir/machine_tag_cache/#{host_name}/tags.json"))) }
 
   it "should have 5 application specific entries" do

diff --git a/test/integration/database/serverspec/server_spec.rb b/test/integration/database/serverspec/server_spec.rb
@@ -4,7 +4,7 @@
 require 'time'
 
 describe "Database server tags" do
-  let(:host_name) { Socket.gethostname }
+  let(:host_name) { Socket.gethostname.split('.').first }
   let(:db_tags) { MachineTag::Set.new(JSON.parse(IO.read("/vagrant/cache_dir/machine_tag_cache/#{host_name}/tags.json"))) }
 
   it "should have 5 application specific entries" do

diff --git a/test/integration/default/serverspec/server_spec.rb b/test/integration/default/serverspec/server_spec.rb
@@ -3,7 +3,7 @@
 require 'socket'
 
 describe "Default server tags" do
-  let(:host_name) { Socket.gethostname }
+  let(:host_name) { Socket.gethostname.split('.').first }
   let(:default_tags) { MachineTag::Set.new(JSON.parse(IO.read("/vagrant/cache_dir/machine_tag_cache/#{host_name}/tags.json"))) }
 
   it "should have a UUID of 01-ABCDEFG123456" do

diff --git a/test/integration/load_balancer/serverspec/server_spec.rb b/test/integration/load_balancer/serverspec/server_spec.rb
@@ -3,7 +3,7 @@
 require 'socket'
 
 describe "Load balancer server tags" do
-  let(:host_name) { Socket.gethostname }
+  let(:host_name) { Socket.gethostname.split('.').first }
   let(:lb_tags) { MachineTag::Set.new(JSON.parse(IO.read("/vagrant/cache_dir/machine_tag_cache/#{host_name}/tags.json"))) }
 
   it "should have 2 application specific entry" do