From 4e9f4bfbbfc6d0635fd485a23691285e6327b1a9 Mon Sep 17 00:00:00 2001
From: Paul Craciunoiu <paul@craciunoiu.net>
Date: Fri, 15 Jan 2016 10:23:29 -0700
Subject: [PATCH] Fix for ReturnValues.

---
 moto/dynamodb2/responses.py                                  | 4 ++++
 tests/test_dynamodb2/test_dynamodb_table_with_range_key.py   | 5 ++++-
 .../test_dynamodb2/test_dynamodb_table_without_range_key.py  | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/moto/dynamodb2/responses.py b/moto/dynamodb2/responses.py
index 48340405..dd51ac97 100644
--- a/moto/dynamodb2/responses.py
+++ b/moto/dynamodb2/responses.py
@@ -400,8 +400,12 @@ class DynamoHandler(BaseResponse):
         key = self.body['Key']
         update_expression = self.body.get('UpdateExpression')
         attribute_updates = self.body.get('AttributeUpdates')
+        existing_item = dynamodb_backend2.get_item(name, key)
         item = dynamodb_backend2.update_item(name, key, update_expression, attribute_updates)
 
         item_dict = item.to_json()
         item_dict['ConsumedCapacityUnits'] = 0.5
+        if not existing_item:
+            item_dict['Attributes'] = {}
+
         return dynamo_json_dump(item_dict)
diff --git a/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py b/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py
index 6a5010bb..df942891 100644
--- a/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py
+++ b/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py
@@ -859,7 +859,7 @@ def test_update_item_does_not_exist_is_created():
     table = _create_table_with_range_key()
 
     item_key = {'forum_name': 'the-key', 'subject': '123'}
-    table.update_item(
+    result = table.update_item(
         Key=item_key,
         AttributeUpdates={
             'username': {
@@ -875,8 +875,11 @@ def test_update_item_does_not_exist_is_created():
                 'Value': {'key': 'value'},
             }
         },
+        ReturnValues='ALL_OLD',
     )
 
+    assert not result.get('Attributes')
+
     returned_item = dict((k, str(v) if isinstance(v, Decimal) else v)
                          for k, v in table.get_item(Key=item_key)['Item'].items())
     dict(returned_item).should.equal({
diff --git a/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py b/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py
index 6baeb8a1..27acae9f 100644
--- a/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py
+++ b/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py
@@ -430,7 +430,7 @@ def test_update_item_remove():
     }
     table.put_item(data=data)
     key_map = {
-        "S": "steve"
+        'username': {"S": "steve"}
     }
 
     # Then remove the SentBy field
@@ -455,7 +455,7 @@ def test_update_item_set():
     }
     table.put_item(data=data)
     key_map = {
-        "S": "steve"
+        'username': {"S": "steve"}
     }
 
     conn.update_item("messages", key_map, update_expression="SET foo=:bar, blah=:baz REMOVE :SentBy")