lib/kitchen/driver/ec2.rb in kitchen-ec2-0.9.2 vs lib/kitchen/driver/ec2.rb in kitchen-ec2-0.9.3

@@ -186,10 +186,14 @@
         else
           # On-demand instance
           server = submit_server
         end
         info("Instance <#{server.id}> requested.")
+        ec2.client.wait_until(
+          :instance_exists,
+          :instance_ids => [server.id]
+        )
         tag_server(server)
 
         state[:server_id] = server.id
         info("EC2 instance <#{state[:server_id]}> created.")
         wait_log = proc do |attempts|
@@ -232,9 +236,10 @@
         if state[:spot_request_id]
           debug("Deleting spot request <#{state[:server_id]}>")
           ec2.client.cancel_spot_instance_requests(
             :spot_instance_request_ids => [state[:spot_request_id]]
           )
+          state.delete(:spot_request_id)
         end
         info("EC2 instance <#{state[:server_id]}> destroyed.")
         state.delete(:server_id)
         state.delete(:hostname)
       end