Changeset 3552

Timestamp:

09/12/07 17:10:35 (1 year ago)

Author:

mscott

Message:

schevo.store

• Remove unused client/server stuff. We'll use SchevoDurus for this when we use that functionality.
  

Files:

• trunk/Schevo/schevo/store/client_storage.py (deleted)
• trunk/Schevo/schevo/store/run_durus.py (deleted)
• trunk/Schevo/schevo/store/storage_server.py (deleted)
• trunk/Schevo/schevo/store/tests/stress.py (deleted)
• trunk/Schevo/schevo/store/tests/test_store_client_storage.py (deleted)
• trunk/Schevo/schevo/store/tests/test_store_connection.py (modified) (3 diffs)
• trunk/Schevo/schevo/store/tests/test_store_storage_server.py (deleted)

trunk/Schevo/schevo/store/tests/test_store_connection.py

@@ -7 +7 @@
-import sys
-
-from schevo.store import run_durus
-from schevo.store.client_storage import ClientStorage
-from schevo.store.connection import Connection, touch_every_reference
-from schevo.store.error import ConflictError
@@ -16 +14 @@
-from schevo.store.storage import get_reference_index, get_census
-from schevo.store.storage import gen_referring_oid_record, Storage
-from schevo.store.storage_server import DEFAULT_HOST
-from schevo.store.utils import p64
-from popen2 import popen4
@@ -119 +116 @@
-        assert root['b'].c._p_is_unsaved()
-        assert not root._p_is_unsaved()
-
-
-if not 'SKIP_SLOW' in os.environ:
-    class TestConnectionClientStorage (TestConnection):
-
-        def setUp(self):
-            self.port = 9123
-            self.server = popen4('python %s --port=%s' % (
-                run_durus.__file__, self.port))
-            sleep(3) # wait for bind
-
-        def tearDown(self):
-            run_durus.stop_durus((DEFAULT_HOST, self.port))
-
-        def _get_storage(self):
-            return ClientStorage(port=self.port)
-
-        def test_check_conflict(self):
-            b = Connection(self._get_storage())
-            c = Connection(self._get_storage())
-            rootb = b.get(p64(0))
-            rootb['b'] = Persistent()
-            rootc = c.get(p64(0))
-            rootc['c'] = Persistent()
-            c.commit()
-            assert raises(ConflictError, b.commit)
-            assert raises(KeyError, rootb.__getitem__, 'c')
-            transaction_serial = b.transaction_serial
-            b.abort()
-            assert b.get_transaction_serial() > transaction_serial
-            assert rootb._p_is_ghost()
-            rootc['d'] = Persistent()
-            c.commit()
-            rootb['d']
-
-        def test_check_fine_conflict(self):
-            c1 = Connection(self._get_storage())
-            c2 = Connection(self._get_storage())
-            c1.get_root()['A'] = Persistent()
-            c1.get_root()['A'].a = 1
-            c1.get_root()['B'] = Persistent()
-            c1.commit()
-            c2.abort()
-            # c1 has A loaded.
-            assert not c1.get_root()['A']._p_is_ghost()
-            c1.get_root()['B'].b = 1
-            c2.get_root()['A'].a = 2
-            c2.commit()
-            # Even though A has been changed by c2,
-            # c1 has not accessed an attribute of A since
-            # the last c1.commit(), so we don't want a ConflictError.
-            c1.commit()
-            assert not c1.get_root()['A']._p_is_ghost()
-            c1.get_root()['A'].a # accessed!
-            c1.get_root()['B'].b = 1
-            c2.get_root()['A'].a = 2
-            c2.commit()
-            assert raises(ConflictError, c1.commit)
-
-        def _scenario(self):
-            c1 = Connection(self._get_storage())
-            c2 = Connection(self._get_storage())
-            c1.get_root()['A'] = Persistent()
-            c1.get_root()['B'] = Persistent()
-            c1.get_root()['A'].a = 1
-            c1.commit()
-            c2.abort()
-            c1.cache.recent_objects.discard(c1.get_root()['A'])
-            # Imagine c1 has been running for a while, and
-            # cache management, for example, has caused the
-            # cache reference to be weak.
-            return c1, c2
-
-        def test_conflict_from_invalid_removable_previously_accessed(self):
-            c1, c2 = self._scenario()
-            A = c1.get_root()['A']
-            A.a # access A in c1.  This will lead to conflict.
-            A_oid = A._p_oid
-            assert A in c1.cache.recent_objects
-            A = None # forget about it
-            print
-            # Lose the reference to A.
-            c1.get_root()._p_set_status_ghost()
-            # Commit a new A in c2.
-            c2.get_root()['A'].a = 2
-            c2.commit()
-            c1.get_root()['B'].b = 1 # touch B in c1
-            # Conflict because A has been accessed in c1, but it is invalid.
-            assert raises(ConflictError, c1.commit)
-
-        def test_no_conflict_from_invalid_removable_not_previously_accessed(self):
-            c1, c2 = self._scenario()
-            c1.get_root()._p_set_status_ghost()
-            # Commit a new A in c2.
-            c2.get_root()['A'].a = 2
-            c2.commit()
-            c1.get_root()['B'].b = 1 # touch B in c1
-            # A was not accessed before the reference was lost,
-            # so there is no conflict.
-            c1.commit()
-
-        def test_check_persistentbase_refs(self):
-            refs = getattr(sys, 'gettotalrefcount', None)
-            if refs is None:
-                return
-            before = 0
-            after = 0
-            before = refs()
-            PersistentBase()
-            after = refs()
-            assert after - before == 0, after - before
-
-        def test_check_connectionbase_refs(self):
-            refs = getattr(sys, 'gettotalrefcount', None)
-            if refs is None:
-                return
-            before = 0
-            after = 0
-            before = refs()
-            ConnectionBase()
-            after = refs()
-            assert after - before == 0, after - before
-
-