From 062256ada323c80ec5ffe0d9656ef4cde4e394ff Mon Sep 17 00:00:00 2001
From: Chris Henry <henry.christopher@gmail.com>
Date: Sun, 18 Jan 2015 15:53:59 -0500
Subject: [PATCH 1/5] Use the current time when launching an instance.

---
 moto/ec2/models.py              | 1 +
 moto/ec2/responses/instances.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/moto/ec2/models.py b/moto/ec2/models.py
index e9246a6bf..574621001 100644
--- a/moto/ec2/models.py
+++ b/moto/ec2/models.py
@@ -299,6 +299,7 @@ class Instance(BotoInstance, TaggedEC2Resource):
         self.subnet_id = kwargs.get("subnet_id")
         self.key_name = kwargs.get("key_name")
         self.source_dest_check = "true"
+        self.launch_time = datetime.now().strftime('%y-%m-%dT%H:%M:%S%z')
 
         self.block_device_mapping = BlockDeviceMapping()
         self.block_device_mapping['/dev/sda1'] = BlockDeviceType(volume_id=random_volume_id())
diff --git a/moto/ec2/responses/instances.py b/moto/ec2/responses/instances.py
index 7922f9d99..49b385a58 100644
--- a/moto/ec2/responses/instances.py
+++ b/moto/ec2/responses/instances.py
@@ -325,7 +325,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns='http://ec2.amazona
                     <amiLaunchIndex>0</amiLaunchIndex>
                     <productCodes/>
                     <instanceType>{{ instance.instance_type }}</instanceType>
-                    <launchTime>YYYY-MM-DDTHH:MM:SS+0000</launchTime>
+                    <launchTime>{{ instance.launch_time }}</launchTime>
                     <placement>
                       <availabilityZone>us-west-2a</availabilityZone>
                       <groupName/>

From 77185f9beeb6214861c0ded6ea1b5b21a388e007 Mon Sep 17 00:00:00 2001
From: Chris Henry <henry.christopher@gmail.com>
Date: Sun, 18 Jan 2015 16:18:34 -0500
Subject: [PATCH 2/5] Change timestamp format to ISO 8601, as per
 http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html

---
 moto/ec2/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moto/ec2/models.py b/moto/ec2/models.py
index 574621001..166858960 100644
--- a/moto/ec2/models.py
+++ b/moto/ec2/models.py
@@ -299,7 +299,7 @@ class Instance(BotoInstance, TaggedEC2Resource):
         self.subnet_id = kwargs.get("subnet_id")
         self.key_name = kwargs.get("key_name")
         self.source_dest_check = "true"
-        self.launch_time = datetime.now().strftime('%y-%m-%dT%H:%M:%S%z')
+        self.launch_time = datetime.now().isoformat()
 
         self.block_device_mapping = BlockDeviceMapping()
         self.block_device_mapping['/dev/sda1'] = BlockDeviceType(volume_id=random_volume_id())

From 19a1b74c5b5a73e4704a31441b8b5974a41f5b86 Mon Sep 17 00:00:00 2001
From: Chris Henry <henry.christopher@gmail.com>
Date: Sun, 18 Jan 2015 16:20:59 -0500
Subject: [PATCH 3/5] Change timestamp format to ISO 8601, as per
 http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html

---
 moto/ec2/responses/instances.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moto/ec2/responses/instances.py b/moto/ec2/responses/instances.py
index 49b385a58..62456bc87 100644
--- a/moto/ec2/responses/instances.py
+++ b/moto/ec2/responses/instances.py
@@ -204,7 +204,7 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
           <keyName>{{ instance.key_name }}</keyName>
           <amiLaunchIndex>0</amiLaunchIndex>
           <instanceType>{{ instance.instance_type }}</instanceType>
-          <launchTime>2007-08-07T11:51:50.000Z</launchTime>
+          <launchTime>{{ instance.launch_time }}</launchTime>
           <placement>
             <availabilityZone>us-east-1b</availabilityZone>
             <groupName/>

From 40b97d1bb29e7d79bcc34070d0903724139f1747 Mon Sep 17 00:00:00 2001
From: Chris Henry <henry.christopher@gmail.com>
Date: Sun, 18 Jan 2015 16:30:39 -0500
Subject: [PATCH 4/5] Test that launch_time is a iso 8601 string.

---
 tests/test_ec2/test_instances.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/test_ec2/test_instances.py b/tests/test_ec2/test_instances.py
index 4036f1214..346eef514 100644
--- a/tests/test_ec2/test_instances.py
+++ b/tests/test_ec2/test_instances.py
@@ -4,6 +4,7 @@ import tests.backport_assert_raises
 from nose.tools import assert_raises
 
 import base64
+import datetime
 
 import boto
 from boto.ec2.instance import Reservation, InstanceAttribute
@@ -50,6 +51,7 @@ def test_instance_launch_and_terminate():
     instances.should.have.length_of(1)
     instances[0].id.should.equal(instance.id)
     instances[0].state.should.equal('running')
+    datetime.datetime.strptime(instances[0].launch_time, '%Y-%m-%dT%H:%M:%S.%f')
 
     root_device_name = instances[0].root_device_name
     instances[0].block_device_mapping[root_device_name].status.should.equal('attached')
@@ -604,13 +606,13 @@ def test_describe_instance_status_with_non_running_instances():
 @mock_ec2
 def test_get_instance_by_security_group():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    
+
     conn.run_instances('ami-1234abcd')
     instance = conn.get_only_instances()[0]
 
     security_group = conn.create_security_group('test', 'test')
     conn.modify_instance_attribute(instance.id, "groupSet", [security_group.id])
-    
+
     security_group_instances = security_group.instances()
 
     assert len(security_group_instances) == 1

From 6743a41b266ea0387d901b6da846eb5032893c66 Mon Sep 17 00:00:00 2001
From: Chris Henry <henry.christopher@gmail.com>
Date: Sun, 18 Jan 2015 16:37:56 -0500
Subject: [PATCH 5/5] Fix merge conflict,

---
 moto/ec2/models.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/moto/ec2/models.py b/moto/ec2/models.py
index edd56f898..8fdb7444b 100644
--- a/moto/ec2/models.py
+++ b/moto/ec2/models.py
@@ -299,11 +299,8 @@ class Instance(BotoInstance, TaggedEC2Resource):
         self.subnet_id = kwargs.get("subnet_id")
         self.key_name = kwargs.get("key_name")
         self.source_dest_check = "true"
-<<<<<<< HEAD
         self.launch_time = datetime.now().isoformat()
-=======
         self.private_ip_address = kwargs.get('private_ip_address')
->>>>>>> c22ea3014b8d2068696ef246e90bd9ec8ec90b91
 
         self.block_device_mapping = BlockDeviceMapping()
         self.block_device_mapping['/dev/sda1'] = BlockDeviceType(volume_id=random_volume_id())