Merge pull request #377 from spulec/fix-dynamo-item-not-found

Fix dynamo item not found

moto/dynamodb2/models.py

@@ -381,7 +381,7 @@ class DynamoDBBackend(BaseBackend):
     def get_item(self, table_name, keys):
         table = self.get_table(table_name)
         if not table:
-            return None
+            raise ValueError("No table found")
         hash_key, range_key = self.get_keys_value(table, keys)
         return table.get_item(hash_key, range_key)
 

moto/dynamodb2/responses.py

@@ -196,8 +196,8 @@ class DynamoHandler(BaseResponse):
             return dynamo_json_dump(item_dict)
         else:
             # Item not found
-            er = 'com.amazonaws.dynamodb.v20111205#ResourceNotFoundException'
+            er = '{}'
-            return self.error(er, status=404)
+            return self.error(er, status=200)
 
     def batch_get_item(self):
         table_batches = self.body['RequestItems']

tests/test_dynamodb2/test_dynamodb_table_without_range_key.py

@@ -10,7 +10,7 @@ try:
     from boto.dynamodb2.fields import HashKey
     from boto.dynamodb2.table import Table
     from boto.dynamodb2.table import Item
-    from boto.dynamodb2.exceptions import ConditionalCheckFailedException
+    from boto.dynamodb2.exceptions import ConditionalCheckFailedException, ItemNotFound
 except ImportError:
     pass
 
@@ -369,6 +369,13 @@ def test_get_key_fields():
     kf[0].should.equal('forum_name')
 
 
+@requires_boto_gte("2.9")
+@mock_dynamodb2
+def test_get_missing_item():
+    table = create_table()
+    table.get_item.when.called_with(forum_name='missing').should.throw(ItemNotFound)
+
+
 @requires_boto_gte("2.9")
 @mock_dynamodb2
 def test_get_special_item():