torpedo 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Sat Oct 29 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.3
+  - Fix issues boolean config file issue with test_create_image,
+   test_rebuild_server, and test_resize_server config options.
+  - Fix a syntax issue in the get_flavor_ref_resize method.
+
 * Sat Oct 29 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.2
   - Add missing dependency to gemspec for test-unit-ext.
 

data/README.md

@@ -4,7 +4,7 @@ Torpedo
 Description
 -----------
 
-Sink bad code! Ruby Smoke Tests for the OpenStack.
+Fire when ready. Fast Ruby integration tests for OpenStack.
 
 Installation
 ------------
@@ -15,6 +15,11 @@ Installation
     cat > ~/.torpedo.conf <<"EOF_CAT"
 	# YAML config file for torpedo
 
+	# timeouts
+	server_build_timeout: 120
+	ping_timeout: 60
+	ssh_timeout: 30
+
 	# SERVER test settings
 	test_create_image: false
 	test_rebuild_server: false
@@ -28,10 +33,6 @@ Installation
 	#flavor_name: 
 	flavor_ref: 4
 
-	# TIMEOUTS
-	#ping_timeout: 60
-	#ssh_timeout: 30
-
 	# SSH KEYS (used to verify images which use an agent)
 	#ssh_private_key: 
 	#ssh_public_key: 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/torpedo/compute/helper.rb

@@ -71,7 +71,7 @@ module Helper
     elsif not flavor_ref_resize or flavor_ref_resize.to_s.empty? then
       # if no flavor ref is specified for resize add one to it
       flavor_ref = Helper.get_flavor_ref(conn)
-      flavor_ref_resize = flavor_ref.to_is + 1
+      flavor_ref_resize = flavor_ref.to_i + 1
     end
 
     flavor_ref_resize.to_s

data/lib/torpedo/compute/servers.rb

@@ -224,7 +224,7 @@ class Servers < Test::Unit::TestCase
     # Overwrite image_ref to make all subsequent tests use this snapshot
     @@image_ref = image.id.to_s
 
-  end if TEST_CREATE_IMAGE == "true"
+  end if TEST_CREATE_IMAGE
 
   def test_021_delete_image_metadata_items
 
@@ -237,7 +237,7 @@ class Servers < Test::Unit::TestCase
 
     assert_equal 0, metadata.size
 
-  end if TEST_CREATE_IMAGE == "true"
+  end if TEST_CREATE_IMAGE
 
   def test_022_update_one_image_metadata_item
 
@@ -251,7 +251,7 @@ class Servers < Test::Unit::TestCase
 
     assert_equal 1, metadata.size
  
-  end if TEST_CREATE_IMAGE == "true"
+  end if TEST_CREATE_IMAGE
 
   def test_023_update_some_image_metadata_items
 
@@ -267,7 +267,7 @@ class Servers < Test::Unit::TestCase
 
     assert_equal 2, metadata.size
  
-  end if TEST_CREATE_IMAGE == "true"
+  end if TEST_CREATE_IMAGE
 
   def test_024_set_image_metadata_items
 
@@ -285,7 +285,7 @@ class Servers < Test::Unit::TestCase
 
     assert_equal 3, metadata.size
  
-  end if TEST_CREATE_IMAGE == "true"
+  end if TEST_CREATE_IMAGE
 
   def test_025_clear_image_metadata
 
@@ -296,7 +296,7 @@ class Servers < Test::Unit::TestCase
 
     assert_equal 0, metadata.size
  
-  end if TEST_CREATE_IMAGE == "true"
+  end if TEST_CREATE_IMAGE
   
   def test_030_rebuild_instance
     # make sure our snapshot boots
@@ -306,7 +306,7 @@ class Servers < Test::Unit::TestCase
     sleep 15 # sleep a couple seconds until rebuild starts
     check_server(server, @@image_ref, @@flavor_ref)
 
-  end if TEST_REBUILD_SERVER == "true"
+  end if TEST_REBUILD_SERVER
 
   def test_040_resize_instance
 
@@ -338,7 +338,7 @@ class Servers < Test::Unit::TestCase
 
     check_server(server, @@image_ref, flavor_ref_resize)
 
-  end if TEST_RESIZE_SERVER == "true"
+  end if TEST_RESIZE_SERVER
 
   def test_999_teardown
     @@servers.each do |server|

data/lib/torpedo.rb

@@ -8,9 +8,9 @@ PING_TIMEOUT=(configs['ping_timeout'] || 60).to_i
 SERVER_BUILD_TIMEOUT=(configs['server_build_timeout'] || 60).to_i
 SSH_PRIVATE_KEY=configs['ssh_private_key'] || ENV['HOME'] + "/.ssh/id_rsa"
 SSH_PUBLIC_KEY=configs['ssh_public_key'] || ENV['HOME'] + "/.ssh/id_rsa.pub"
-TEST_CREATE_IMAGE=configs['test_create_image'] || "false"
-TEST_REBUILD_SERVER=configs['test_rebuild_server'] || "false"
-TEST_RESIZE_SERVER=configs['test_resize_server'] || "false"
+TEST_CREATE_IMAGE=configs['test_create_image'] || false
+TEST_REBUILD_SERVER=configs['test_rebuild_server'] || false
+TEST_RESIZE_SERVER=configs['test_resize_server'] || false
 KEYPAIR=configs['keypair']
 KEYNAME=configs['keyname']
 

data/torpedo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{torpedo}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Prince"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torpedo
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Dan Prince