From 64a9f633dc339f2940bfeb429dc685026262877b Mon Sep 17 00:00:00 2001
From: "geemus (Wesley Beary)" <wbeary@engineyard.com>
Date: Wed, 7 Apr 2010 20:53:59 -0700
Subject: [PATCH] [ec2] misc mock fixes

---
 lib/fog/aws/requests/ec2/describe_instances.rb | 2 +-
 lib/fog/aws/requests/ec2/describe_snapshots.rb | 6 +++---
 lib/fog/aws/requests/ec2/run_instances.rb      | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/fog/aws/requests/ec2/describe_instances.rb b/lib/fog/aws/requests/ec2/describe_instances.rb
index c4991a67a..e927e3677 100644
--- a/lib/fog/aws/requests/ec2/describe_instances.rb
+++ b/lib/fog/aws/requests/ec2/describe_instances.rb
@@ -62,7 +62,7 @@ module Fog
 
       class Mock
 
-        def describe_instances(instance_id = {})
+        def describe_instances(instance_id = [])
           response = Excon::Response.new
           instance_id = [*instance_id]
           if instance_id != []
diff --git a/lib/fog/aws/requests/ec2/describe_snapshots.rb b/lib/fog/aws/requests/ec2/describe_snapshots.rb
index c70a6e86e..80acf6fec 100644
--- a/lib/fog/aws/requests/ec2/describe_snapshots.rb
+++ b/lib/fog/aws/requests/ec2/describe_snapshots.rb
@@ -43,11 +43,11 @@ module Fog
 
           snapshot_set.each do |snapshot|
             case snapshot['status']
-            when 'creating'
-              if Time.now - volume['createTime'] > 2
+            when 'in progress', 'pending'
+              if Time.now - snapshot['startTime'] > 2
                 snapshot['progress']  = '100%'
                 snapshot['status']    = 'completed'
-              else
+              elsif Time.now - snapshot['startTime'] > 1
                 snapshot['progress']  = '50%'
                 snapshot['status']    = 'in progress'
               end
diff --git a/lib/fog/aws/requests/ec2/run_instances.rb b/lib/fog/aws/requests/ec2/run_instances.rb
index 76411c885..c0dd451d9 100644
--- a/lib/fog/aws/requests/ec2/run_instances.rb
+++ b/lib/fog/aws/requests/ec2/run_instances.rb
@@ -102,7 +102,6 @@ module Fog
 
           group_set = [ (options['GroupId'] || 'default') ]
           instances_set = []
-          owner_id = @owner_id
           reservation_id = Fog::AWS::Mock.reservation_id
 
           min_count.times do |i|
@@ -120,7 +119,7 @@ module Fog
               'keyName'             => options['KeyName'] || '',
               'launchTime'          => Time.now,
               'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
-              'ownerId'             => owner_id,
+              'ownerId'             => @owner_id,
               'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
               'privateDnsName'      => '',
               'productCodes'        => [],
@@ -135,7 +134,7 @@ module Fog
           response.body = {
             'groupSet'      => group_set,
             'instancesSet'  => instances_set,
-            'ownerId'       => owner_id,
+            'ownerId'       => @owner_id,
             'requestId'     => Fog::AWS::Mock.request_id,
             'reservationId' => reservation_id
           }