Error handling: Model-level validations, proper error responses.

tests/test_ec2/test_vpcs.py

@@ -1,6 +1,7 @@
 import boto
 from boto.exception import EC2ResponseError
 import sure  # noqa
+from nose.tools import assert_raises
 
 from moto import mock_ec2
 
@@ -19,8 +20,11 @@ def test_vpcs():
     all_vpcs = conn.get_all_vpcs()
     all_vpcs.should.have.length_of(0)
 
-    conn.delete_vpc.when.called_with(
-        "vpc-1234abcd").should.throw(EC2ResponseError)
+    with assert_raises(EC2ResponseError) as cm:
+        conn.delete_vpc("vpc-1234abcd")
+    cm.exception.code.should.equal('InvalidVpcID.NotFound')
+    cm.exception.status.should.equal(400)
+    cm.exception.request_id.should_not.be.none
 
 
 @mock_ec2