torpedo 1.0.17 → 1.0.18

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Mon Nov 12 2012 Dan Prince <dprince@redhat.com> - 1.0.18
+  -Fixes to host_id validation on resize/resize_revert tests.
+
 * Mon Apr 9 2012 Dan Prince <dprince@redhat.com> - 1.0.17
   -Adding SLEEP_AFTER_IMAGE_CREATE env option.
   -Added 'test_limits' option.

data/Gemfile.lock

@@ -6,7 +6,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+    rake (0.9.2.2)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-1.0.17
+1.0.18

data/lib/torpedo/compute/servers.rb

@@ -13,6 +13,7 @@ class Servers < Test::Unit::TestCase
   @@flavor_ref_resize = nil
   @@server = nil #ref to last created server
   @@hostname = "torpedo"
+  @@host_id = nil
 
   def setup
     @conn=Helper::get_connection
@@ -22,7 +23,6 @@ class Servers < Test::Unit::TestCase
     @@server = @conn.create_server(server_opts)
     @@servers << @@server
     @@admin_pass = @@server.adminPass #original admin_pass
-    @@host_id = @@server.hostId #original host ID
     @@server
   end
 
@@ -321,6 +321,10 @@ class Servers < Test::Unit::TestCase
 
   def test_040_resize_revert
 
+    # before resizing obtain host_id
+    server = @conn.server(@@server.id)
+    @@host_id = server.hostId #original host ID
+
     @@server.resize!(@@flavor_ref_resize)
     server = @conn.server(@@server.id)
     assert_equal('RESIZE', server.status)
@@ -355,12 +359,16 @@ class Servers < Test::Unit::TestCase
     end
 
     check_server(server, @@image_ref, @@flavor_ref)
-    assert_equal(server.hostId, @@host_id)
+    assert_equal(@@host_id, server.hostId)
 
   end if TEST_REVERT_RESIZE_SERVER
 
   def test_041_resize
 
+    # before resizing obtain host_id
+    server = @conn.server(@@server.id)
+    @@host_id = server.hostId #original host ID
+
     @@server.resize!(@@flavor_ref_resize)
     server = @conn.server(@@server.id)
     assert_equal('RESIZE', server.status)
@@ -380,7 +388,7 @@ class Servers < Test::Unit::TestCase
     end
  
     check_server(server, @@image_ref, @@flavor_ref_resize, 'VERIFY_RESIZE')
-    assert_not_equal(server.hostId, @@host_id) if TEST_HOSTID_ON_RESIZE
+    assert_not_equal(@@host_id, server.hostId) if TEST_HOSTID_ON_RESIZE
 
   end if TEST_RESIZE_SERVER
 

metadata

@@ -1,112 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: torpedo
-version: !ruby/object:Gem::Version 
-  hash: 53
+version: !ruby/object:Gem::Version
+  version: 1.0.18
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 17
-  version: 1.0.17
 platform: ruby
-authors: 
+authors:
 - Dan Prince
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  version_requirements: *id001
-  name: bundler
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  version_requirements: *id002
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 14
-        - 6
-        version: 0.14.6
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.6
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 1
-        - 5
-        version: 1.1.5
-  version_requirements: *id004
+      - !ruby/object:Gem::Version
+        version: 0.14.6
+- !ruby/object:Gem::Dependency
   name: openstack-compute
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.5
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 2
-        - 1
-        version: 2.2.1
-  version_requirements: *id005
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 description: Fast integration tests OpenStack Compute.
 email: dan.prince@rackspace.com
-executables: 
+executables:
 - torpedo
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - CHANGELOG
 - Gemfile
@@ -126,37 +119,31 @@ files:
 - test/helper.rb
 - torpedo.gemspec
 homepage: http://github.com/dprince/torpedo
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3718277356387359406
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fire when ready. Fast Ruby integration tests for OpenStack.
 test_files: []
-