From 416b325044c2794d5d99a9823f85de24956650ff Mon Sep 17 00:00:00 2001
From: Nick Joyce <nick@boxdesign.co.uk>
Date: Tue, 27 Jan 2015 12:09:14 +0000
Subject: [PATCH] Ensure the testbed is deactivated

---
 pyamf/__init__.py                   |  1 +
 pyamf/tests/adapters/test_google.py | 31 +++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pyamf/__init__.py b/pyamf/__init__.py
index d9fe1f17..f4f246ca 100644
--- a/pyamf/__init__.py
+++ b/pyamf/__init__.py
@@ -23,6 +23,7 @@
 __all__ = [
     'register_class',
     'register_class_loader',
+    'get_adapter',
     'encode',
     'decode',
     '__version__',
diff --git a/pyamf/tests/adapters/test_google.py b/pyamf/tests/adapters/test_google.py
index 57eba7d4..f1776677 100644
--- a/pyamf/tests/adapters/test_google.py
+++ b/pyamf/tests/adapters/test_google.py
@@ -72,10 +72,10 @@ def setUp(self):
         # Next, declare which service stubs you want to use.
         self.testbed.init_datastore_v3_stub()
         self.testbed.init_memcache_stub()
+        self.addCleanup(self.testbed.deactivate)
 
     def put(self, entity):
         entity.put()
-        self.addCleanup(self.deleteEntity, entity)
 
     def deleteEntity(self, entity):
         if entity.is_saved():
@@ -180,7 +180,7 @@ def test_amf3(self):
         self.assertEncodes(self.jessica, bytes, encoding=pyamf.AMF3)
 
     def test_save_amf0(self):
-        self.put(self.jessica)
+        self.jessica.put()
 
         bytes = ('\x03', (
             '\x00\x04_key%s' % self.encodeKey(self.jessica, pyamf.AMF0),
@@ -194,7 +194,7 @@ def test_save_amf0(self):
         self.assertEncodes(self.jessica, bytes, encoding=pyamf.AMF0)
 
     def test_save_amf3(self):
-        self.put(self.jessica)
+        self.jessica.put()
 
         bytes = (
             '\n\x0b\x01', (
@@ -287,7 +287,7 @@ def test_amf3(self):
         self.assertEncodes(self.jessica, bytes, encoding=pyamf.AMF3)
 
     def test_save_amf0(self):
-        self.put(self.jessica)
+        self.jessica.put()
 
         bytes = pyamf.encode(self.jessica, encoding=pyamf.AMF0).getvalue()
 
@@ -302,7 +302,7 @@ def test_save_amf0(self):
             '\x00\x00\t'))
 
     def test_save_amf3(self):
-        self.put(self.jessica)
+        self.jessica.put()
 
         bytes = (
             '\n\x0b\x01', (
@@ -357,7 +357,7 @@ class EncodingReferencesTestCase(BaseTestCase):
 
     def test_model(self):
         a = test_models.Author(name='Jane Austen')
-        self.put(a)
+        a.put()
 
         amf0_k = self.encodeKey(a, pyamf.AMF0)
         amf3_k = self.encodeKey(a, pyamf.AMF3)
@@ -431,7 +431,7 @@ class Novel(db.Expando):
             author = db.ReferenceProperty(Author)
 
         a = Author(name='Jane Austen')
-        self.put(a)
+        a.put()
         k = str(a.key())
 
         amf0_k = struct.pack('>H', len(k)) + k
@@ -499,10 +499,10 @@ class Novel(db.Expando):
 
     def test_dynamic_property_referenced_object(self):
         a = test_models.Author(name='Jane Austen')
-        self.put(a)
+        a.put()
 
         b = test_models.Novel(title='Sense and Sensibility', author=a)
-        self.put(b)
+        b.put()
 
         x = db.get(b.key())
         foo = [1, 2, 3]
@@ -649,7 +649,7 @@ def setUp(self):
 
         pyamf.register_class(self.model_class, 'Pet')
 
-        self.put(self.jessica)
+        self.jessica.put()
         self.key = str(self.jessica.key())
 
     def _check_model(self, x):
@@ -719,6 +719,7 @@ def setUp(self):
 
         self.addCleanup(self.deleteEntity, self.jessica)
         self.addCleanup(self.deleteEntity, self.jessica_expando)
+        self.decoder = pyamf.get_decoder(pyamf.AMF3)
 
     def test_get_alias(self):
         alias = pyamf.register_class(test_models.PetModel)
@@ -813,7 +814,7 @@ def test_get_attributes(self):
         })
 
     def test_get_attributes_saved(self):
-        self.put(self.jessica)
+        self.jessica.put()
 
         attrs = self.alias.getEncodableAttributes(self.jessica)
 
@@ -840,7 +841,7 @@ def test_get_attributes_expando(self):
         })
 
     def test_get_attributes_saved_expando(self):
-        self.put(self.jessica_expando)
+        self.jessica_expando.put()
 
         attrs = self.alias.getEncodableAttributes(self.jessica_expando)
 
@@ -900,7 +901,7 @@ def _set_prop(self, v):
             '_key': None,
             'readonly': False,
             'read_write': 'foo'
-        })
+        }, codec=self.decoder)
 
         self.assertEqual(obj.prop, 'foo')
 
@@ -917,7 +918,7 @@ def setUp(self):
         self.jessica.weight_in_pounds = 5
         self.jessica.spayed_or_neutered = False
 
-        self.put(self.jessica)
+        self.jessica.put()
 
         self.jessica2 = db.get(self.jessica.key())
 
@@ -951,7 +952,7 @@ def test_amf3(self):
 
     def test_nullreference(self):
         c = test_models.Novel(title='Pride and Prejudice', author=None)
-        self.put(c)
+        c.put()
 
         encoder = pyamf.get_encoder(encoding=pyamf.AMF3)
         alias = adapter_db.DataStoreClassAlias(test_models.Novel, None)