Make sure test case verifies returned rather than cached object

Linux2Go · Feb 28, 2013 · 94ffc08 · 94ffc08
1 parent 17bba02
commit 94ffc08
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/riakalchemy/model.py b/riakalchemy/model.py
@@ -270,8 +270,7 @@ def connect(host='127.0.0.1', port=8098, test_server=False):
     if test_server:
         global _test_server
         if _test_server:
-            _test_server.cleanup()
-            _test_server.stop()
+            return
         from riak.test_server import TestServer, Atom
         import tempfile
         tmpdir = tempfile.mkdtemp()

diff --git a/riakalchemy/tests/test_basic.py b/riakalchemy/tests/test_basic.py
@@ -99,7 +99,7 @@ def test_save_and_retrieve_object(self):
         cls, obj = self._set_values_on_init(values)
         obj.save()
         self.addCleanup(obj.delete)
-        cls.get(obj.key)
+        obj = cls.get(obj.key)
         self._verify_values(obj, values)
 
     def test_save_delete_retrieve_failes(self):
@@ -262,8 +262,12 @@ class RiakBackedTests(_BasicTests):
     test_server_started = False
 
     def setUp(self):
-        if not use_system_riak and not self.__class__.test_server_started:
-            riakalchemy.connect(test_server=True, port=riak_port)
-            self.__class__.test_server_started = True
+        if not use_system_riak:
+            if not self.__class__.test_server_started:
+                riakalchemy.connect(test_server=True, port=riak_port)
+                riakalchemy.model._clear_test_connection()
+                self.__class__.test_server_started = True
+            else:
+                riakalchemy.model._clear_test_connection()
         else:
             riakalchemy.connect(test_server=False, port=riak_port)