Merge pull request #237 from tmatilai/centos-integrations-tests

CentOS 5.6 integration test fails
matschaffer · May 3, 2013 · 9fc3467 · 9fc3467
2 parents e9572f2 + deb622d
commit 9fc3467
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/Manifest.txt b/Manifest.txt
@@ -39,7 +39,8 @@ test/integration/cases/cache_path_usage.rb
 test/integration/cases/empty_cook.rb
 test/integration/cases/encrypted_data_bag.rb
 test/integration/cases/knife_bootstrap.rb
-test/integration/centos5_6_test.rb
+test/integration/centos5_8_test.rb
+test/integration/centos6_3_test.rb
 test/integration/debian6_bootstrap_test.rb
 test/integration/debian7_knife_bootstrap_test.rb
 test/integration/gentoo2011_test.rb

diff --git a/test/integration/centos5_6_test.rb → test/integration/centos5_8_test.rb b/test/integration/centos5_6_test.rb → test/integration/centos5_8_test.rb
@@ -1,12 +1,12 @@
 require 'integration_helper'
 
-class Centos5_6Test < IntegrationTest
+class Centos5_8Test < IntegrationTest
   def user
     "root"
   end
 
   def image_id
-    "ami-3fe42456"
+    "ami-100e8a79"
   end
 
   include EmptyCook

diff --git a/test/integration/centos6_3_test.rb b/test/integration/centos6_3_test.rb
@@ -0,0 +1,24 @@
+require 'integration_helper'
+
+class Centos6_3Test < IntegrationTest
+  def user
+    "root"
+  end
+
+  def image_id
+    "ami-86e15bef"
+  end
+
+  def prepare_server
+    disable_firewall
+    super
+  end
+
+  def disable_firewall
+    system "ssh #{connection_string} service iptables stop >> #{log_file}"
+  end
+
+  include EmptyCook
+  include Apache2Cook
+  include EncryptedDataBag
+end