tests/rackspace/models/compute_v2/metadata_tests.rb in fog-1.9.0 vs tests/rackspace/models/compute_v2/metadata_tests.rb in fog-1.10.0

@@ -5,21 +5,23 @@
   service = Fog::Compute::RackspaceV2.new
   test_time = Time.now.to_i.to_s
   
   tests('success') do
     begin
-      @server = service.servers.create(:name => "fog_server_#{test_time}", :flavor_id => 2, :image_id => "3afe97b2-26dc-49c5-a2cc-a2fc8d80c001")
+      @server = service.servers.create(:name => "fog_server_#{test_time}", 
+      :flavor_id => rackspace_test_flavor_id(service),
+      :image_id => rackspace_test_image_id(service))
+      
       @server.wait_for(timeout=1500) { ready? }
       
       tests('server') do
         collection_tests(@server.metadata, {:key => 'my_key', :value => 'my_value'}) do
           @server.wait_for { ready? }
         end
       end
       
       tests('image') do
-        image_id = @server.create_image("fog_image_#{test_time}", :metadata => {:my_key => 'my_value'})
-        @image = service.images.get image_id
+        @image = @server.create_image("fog_image_#{test_time}", :metadata => {:my_key => 'my_value'})
         @image.wait_for(timeout = 1500) { ready? }
         tests("#all").succeeds do
           pending if Fog.mocking? && !mocks_implemented
           metadata = @image.metadata.all
           my_metadata = metadata.select {|datum| datum.key == 'my_key'}
\ No newline at end of file