tests/rackspace/models/block_storage/volume_tests.rb in fog-maestrodev-1.7.0.20121114190951 vs tests/rackspace/models/block_storage/volume_tests.rb in fog-maestrodev-1.8.0.20130109172219

@@ -4,23 +4,29 @@
 
   service = Fog::Rackspace::BlockStorage.new
   options = { :display_name => "fog_#{Time.now.to_i.to_s}", :size => 100 }
 
   model_tests(service.volumes, options, false) do
-    @instance.wait_for { ready? }
+    @instance.wait_for(timeout=1200) { ready? }
 
+    tests('double save').raises(Fog::Rackspace::BlockStorage::IdentifierTaken) do
+      @instance.save
+    end
+
     tests('#attached?').succeeds do
       @instance.state = 'in-use'
       returns(true) { @instance.attached? }
     end
 
     tests('#snapshots').succeeds do
-      snapshot = service.snapshots.create({ :volume_id => @instance.id })
-      snapshot.wait_for { ready? }
+      begin
+        snapshot = @instance.create_snapshot
+        snapshot.wait_for(timeout=1200) { ready? }
 
-      returns(true) { @instance.snapshots.first.id == snapshot.id }
-
-      snapshot.destroy
+        returns(true) { @instance.snapshots.first.id == snapshot.id }
+      ensure
+        snapshot.destroy if snapshot
+      end
     end
 
     @instance.wait_for { snapshots.empty? }
   end
 end