From e7d2c2687aa7d53fe7261c62f70fa4cc6c3bb354 Mon Sep 17 00:00:00 2001
From: Konstantinos Koukopoulos <koukopoulos@gmail.com>
Date: Mon, 24 Feb 2014 13:34:39 +0200
Subject: [PATCH] implement delete_key_pair, test zero case

---
 moto/ec2/responses/key_pairs.py  | 8 +++++++-
 tests/test_ec2/test_key_pairs.py | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/moto/ec2/responses/key_pairs.py b/moto/ec2/responses/key_pairs.py
index c3072af3e..68c25e71f 100644
--- a/moto/ec2/responses/key_pairs.py
+++ b/moto/ec2/responses/key_pairs.py
@@ -18,7 +18,7 @@ class KeyPairs(BaseResponse):
             return template.render(**keypair)
 
     def delete_key_pair(self):
-        raise NotImplementedError('KeyPairs.delete_key_pair is not yet implemented')
+        return Template(DELETE_KEY_PAIR_RESPONSE).render(success="true")
 
     def describe_key_pairs(self):
         template = Template(DESCRIBE_KEY_PAIRS_RESPONSE)
@@ -54,3 +54,9 @@ CREATE_KEY_PAIR_RESPONSE = """<CreateKeyPairResponse xmlns="http://ec2.amazonaws
 CREATE_KEY_PAIR_INVALID_NAME = """<?xml version="1.0" encoding="UTF-8"?>
 <Response><Errors><Error><Code>InvalidKeyPair.Duplicate</Code><Message>The keypair '{{ keypair_id }}' already exists.</Message></Error></Errors><RequestID>f4f76e81-8ca5-4e61-a6d5-a4a96EXAMPLE</RequestID></Response>
 """
+
+
+DELETE_KEY_PAIR_RESPONSE = """<DeleteKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
+  <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId> 
+  <return>{{ success }}</return>
+</DeleteKeyPairResponse>"""
diff --git a/tests/test_ec2/test_key_pairs.py b/tests/test_ec2/test_key_pairs.py
index da266bd41..a23516da6 100644
--- a/tests/test_ec2/test_key_pairs.py
+++ b/tests/test_ec2/test_key_pairs.py
@@ -39,8 +39,15 @@ def test_key_pairs_create_exist():
     kp = conn.create_key_pair('foo')
     assert kp.material.startswith('---- BEGIN RSA PRIVATE KEY ----')
     assert len(conn.get_all_key_pairs()) == 1
-    # Call get_all_instances with a bad id should raise an error
     conn.create_key_pair.when.called_with('foo').should.throw(
         EC2ResponseError,
         "The keypair 'foo' already exists."
     )
+
+
+@mock_ec2
+def test_key_pairs_delete_no_exist():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    assert len(conn.get_all_key_pairs()) == 0
+    r = conn.delete_key_pair('foo')
+    r.should.be.ok