From b88dfffd943fa4300c35c332da14289f76ced056 Mon Sep 17 00:00:00 2001
From: Andrew Melton <andrew.melton@rackspace.com>
Date: Wed, 29 May 2013 10:54:27 -0400
Subject: [PATCH] Accepting tuple from get_or_create in _process_delete
---
stacktach/views.py | 2 +-
tests/unit/test_stacktach.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/stacktach/views.py b/stacktach/views.py
index cdce09c..6b6bfc4 100644
--- a/stacktach/views.py
+++ b/stacktach/views.py
@@ -288,7 +288,7 @@ def _process_delete(raw, body):
'instance': instance_id,
'deleted_at': deleted_at,
}
- delete = STACKDB.get_or_create_instance_delete(**values)
+ (delete, new) = STACKDB.get_or_create_instance_delete(**values)
delete.raw = raw
launched_at = payload.get('launched_at')
diff --git a/tests/unit/test_stacktach.py b/tests/unit/test_stacktach.py
index e096e06..5fe2229 100644
--- a/tests/unit/test_stacktach.py
+++ b/tests/unit/test_stacktach.py
@@ -605,7 +605,7 @@ class StacktachUsageParsingTestCase(unittest.TestCase):
delete.deleted_at = delete_decimal
views.STACKDB.get_or_create_instance_delete(instance=INSTANCE_ID_1,
deleted_at=delete_decimal)\
- .AndReturn(delete)
+ .AndReturn((delete, True))
views.STACKDB.save(delete)
self.mox.ReplayAll()
@@ -629,7 +629,7 @@ class StacktachUsageParsingTestCase(unittest.TestCase):
delete.deleted_at = delete_decimal
views.STACKDB.get_or_create_instance_delete(instance=INSTANCE_ID_1,
deleted_at=delete_decimal)\
- .AndReturn(delete)
+ .AndReturn((delete, True))
views.STACKDB.save(delete)
self.mox.ReplayAll()