torpedo 1.0.11 → 1.0.12

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Fri Dec 30 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.12
+  -Retry ssh on Errno::ECONNRESET.
+  -Added cleanup task.
+
 * Wed Dec 14 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.11
   -Set paranoid to false for ssh connection tests. (net-ssh)
   -Add options to disable server and image cleanup.

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.0.12

data/lib/torpedo/compute/servers.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'torpedo/compute/helper'
 require 'tempfile'
 require 'net/ssh'
 
@@ -66,7 +66,7 @@ class Servers < Test::Unit::TestCase
             Net::SSH.start(ip_addr, 'root', ssh_opts) do |ssh|
                 return ssh.exec!(test_cmd) == test_output
             end
-          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::SSH::Exception
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET, Net::SSH::Exception
             next
           end
         end

data/lib/torpedo.rb

@@ -34,6 +34,8 @@ FLAVOR_NAME_RESIZE=configs['flavor_name_resize']
 
 OPENSTACK_COMPUTE_VERSION=configs['openstack_compute_version']
 
+require 'torpedo/compute/helper'
+
 module Torpedo
 class Tasks < Thor
 
@@ -57,6 +59,25 @@ class Tasks < Thor
       require 'torpedo/compute/servers'
     end
 
+    desc "cleanup", "Clean up servers and images (not necessary normally)."
+    def cleanup
+      conn = Torpedo::Compute::Helper::get_connection
+      conn.servers.each do |server|
+        server = conn.server(server[:id])
+        if server.name == 'torpedo'
+          puts 'Deleting torpedo server'
+          server.delete!
+        end
+      end
+      conn.images.each do |image|
+        image = conn.image(image[:id])
+        if image.server and conn.server(image.server['id']).name == 'torpedo'
+          puts 'Deleting torpedo image'
+          image.delete!
+        end
+      end
+    end
+
     desc "all", "Run all tests."
     def all
       require 'torpedo/compute/flavors'

data/torpedo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{torpedo}
-  s.version = "1.0.10"
+  s.version = "1.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Prince"]
-  s.date = %q{2011-12-07}
+  s.date = %q{2011-12-30}
   s.default_executable = %q{torpedo}
   s.description = %q{Fast integration tests OpenStack Compute.}
   s.email = %q{dan.prince@rackspace.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torpedo
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 0
-  - 11
-  version: 1.0.11
+  - 12
+  version: 1.0.12
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -05:00
+date: 2011-12-30 00:00:00 -05:00
 default_executable: torpedo
 dependencies: 
 - !ruby/object:Gem::Dependency