CHANGELOG

@@ -1,25 +1,3 @@
-- 0.2.10
-	* Add count active states method
-	* Enable complete replace of NEW state on state instantiation
-- 0.2.9
-	* Enable access to is_pure method
-	* Numeric option for elements return value
-- 0.2.8
-	* Remove sync on persist set
-- 0.2.7
-	* Handle missing files in fs readdir list
-- 0.2.6
-	* Ensure atomic state lock in fs
-- 0.2.5
-	* Correct handling of persistent sync when no not-state filter has been set
-- 0.2.4
-	* Add optional concurrency lock for persistence store, implemented for file store
-- 0.2.3
-	* Add noop-store, for convenience for code using persist constructor but will only use memory state
-- 0.2.2
-	* Fix composite state factory load regex
-- 0.2.1
-	* Add rocksdb backend
 - 0.2.0
 	* Add redis backend
 	* UTC timestamp for modification time in core state

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = shep
-version = 0.2.10
+version = 0.2.0rc1
 description = Multi-state key stores using bit masks
 author = Louis Holbrook
 author_email = dev@holbrook.no
@@ -22,7 +22,7 @@ licence_files =
 
 [options]
 include_package_data = True
-python_requires = >= 3.7
+python_requires = >= 3.6
 packages = 
 	shep
 	shep.store

setup.py

@@ -1,8 +1,3 @@
 from setuptools import setup
 
-setup(
+setup()
-    extras_require={
-        'redis': 'redis==3.5.3',
-        'rocksdb': 'lbry-rocksdb==0.8.2',
-        },
-        )

shep/error.py

@@ -32,9 +32,3 @@ class StateTransitionInvalid(Exception):
     """Raised if state transition verification fails
     """
     pass
-
-
-class StateLockedKey(Exception):
-    """Attempt to write to a state key that is being written to by another client
-    """
-    pass

shep/persist.py

@@ -3,10 +3,7 @@ import datetime
 
 # local imports
 from .state import State
-from .error import (
+from .error import StateItemExists
-        StateItemExists,
-        StateLockedKey,
-        )
 
 
 class PersistedState(State):
@@ -20,8 +17,8 @@ class PersistedState(State):
     :type logger: object
     """
 
-    def __init__(self, factory, bits, logger=None, verifier=None, check_alias=True, event_callback=None, default_state=None):
+    def __init__(self, factory, bits, logger=None, verifier=None, check_alias=True, event_callback=None):
-        super(PersistedState, self).__init__(bits, logger=logger, verifier=verifier, check_alias=check_alias, event_callback=event_callback, default_state=default_state)
+        super(PersistedState, self).__init__(bits, logger=logger, verifier=verifier, check_alias=check_alias, event_callback=event_callback)
         self.__store_factory = factory
         self.__stores = {}
 
@@ -37,13 +34,12 @@ class PersistedState(State):
 
         See shep.state.State.put
         """
-        k = self.to_name(state)
+        to_state = super(PersistedState, self).put(key, state=state, contents=contents)
+
+        k = self.name(to_state)
 
         self.__ensure_store(k)
-
+        self.__stores[k].add(key, contents)
-        self.__stores[k].put(key, contents)
-
-        super(PersistedState, self).put(key, state=state, contents=contents)
 
         self.register_modify(key)
 
@@ -60,16 +56,11 @@ class PersistedState(State):
         k_to = self.name(to_state)
         self.__ensure_store(k_to)
 
-        contents = None
+        contents = self.__stores[k_from].get(key)
-        try:
+        self.__stores[k_to].add(key, contents)
-            contents = self.__stores[k_from].get(key)
+        self.__stores[k_from].remove(key)
-            self.__stores[k_to].put(key, contents)
+
-            self.__stores[k_from].remove(key)
+        self.sync(to_state)
-        except StateLockedKey as e:
-            super(PersistedState, self).unset(key, or_state, allow_base=True)
-            raise e
-       
-        #self.sync(to_state)
 
         return to_state
 
@@ -88,7 +79,7 @@ class PersistedState(State):
         self.__ensure_store(k_to)
 
         contents = self.__stores[k_from].get(key)
-        self.__stores[k_to].put(key, contents)
+        self.__stores[k_to].add(key, contents)
         self.__stores[k_from].remove(key)
 
         return to_state
@@ -108,7 +99,7 @@ class PersistedState(State):
         self.__ensure_store(k_to)
 
         contents = self.__stores[k_from].get(key)
-        self.__stores[k_to].put(key, contents)
+        self.__stores[k_to].add(key, contents)
         self.__stores[k_from].remove(key)
 
         self.register_modify(key)
@@ -134,7 +125,7 @@ class PersistedState(State):
         self.__ensure_store(k_to)
 
         contents = self.__stores[k_from].get(key)
-        self.__stores[k_to].put(key, contents)
+        self.__stores[k_to].add(key, contents)
         self.__stores[k_from].remove(key)
 
         self.register_modify(key)
@@ -144,7 +135,7 @@ class PersistedState(State):
         return to_state
 
 
-    def sync(self, state=None, not_state=None):
+    def sync(self, state=None):
         """Reload resources for a single state in memory from the persisted state store.
 
         :param state: State to load
@@ -152,20 +143,11 @@ class PersistedState(State):
         :raises StateItemExists: A content key is already recorded with a different state in memory than in persisted store.
         # :todo: if sync state is none, sync all
         """
-
-        states_numeric = []
-        if state == None:
-            states_numeric = list(self.all(numeric=True))
-        else:
-            states_numeric = [state]
-       
         states = []
-        for state in states_numeric:
+        if state == None:
-            if not_state != None:
+            states = list(self.all())
-                if state & not_state == 0:
+        else:
-                    states.append(self.name(state))
+            states = [self.name(state)]
-            else:
-                states.append(self.name(state))
 
         ks = []
         for k in states:
@@ -226,11 +208,10 @@ class PersistedState(State):
 
         See shep.state.State.replace
         """
+        super(PersistedState, self).replace(key, contents)
         state = self.state(key)
         k = self.name(state)
-        r = self.__stores[k].replace(key, contents)
+        return self.__stores[k].replace(key, contents)
-        super(PersistedState, self).replace(key, contents)
-        return r
 
 
     def modified(self, key):

shep/state.py

@@ -30,22 +30,16 @@ class State:
 
     base_state_name = 'NEW'
 
-    def __init__(self, bits, logger=None, verifier=None, check_alias=True, event_callback=None, default_state=None):
+    def __init__(self, bits, logger=None, verifier=None, check_alias=True, event_callback=None):
         self.__initial_bits = bits
         self.__bits = bits
         self.__limit = (1 << bits) - 1
         self.__c = 0
+        setattr(self, self.base_state_name, 0)
 
-        if default_state == None:
+        self.__reverse = {0: getattr(self, self.base_state_name)}
-            default_state = self.base_state_name
+        self.__keys = {getattr(self, self.base_state_name): []}
-
-        setattr(self, default_state, 0)
-
-        self.__reverse = {0: getattr(self, default_state)}
-        self.__keys = {getattr(self, default_state): []}
         self.__keys_reverse = {}
-        if default_state != self.base_state_name:
-            self.__keys_reverse[default_state] = 0
         self.__contents = {}
         self.modified_last = {}
         self.verifier = verifier
@@ -59,7 +53,7 @@ class State:
 
 
     # return true if v is a single-bit state
-    def is_pure(self, v):
+    def __is_pure(self, v):
         if v == 0:
             return True
         c = 1
@@ -145,7 +139,7 @@ class State:
     def __add_state_list(self, state, item):
         if self.__keys.get(state) == None:
             self.__keys[state] = []
-        if not self.is_pure(state) or state == 0:
+        if not self.__is_pure(state) or state == 0:
             self.__keys[state].append(item)
         c = 1
         for i in range(self.__bits):
@@ -191,18 +185,12 @@ class State:
         self.__set(k, v)
 
 
-    def to_name(self, k):
-        if k == None:
-            k = 0
-        return self.name(k)
-
-
     def __alias(self, k, *args):
         v = 0
         for a in args:
             a = self.__check_value_cursor(a)
             v = self.__check_limit(v | a, pure=False)
-        if self.is_pure(v):
+        if self.__is_pure(v):
             raise ValueError('use add to add pure values')
         return self.__set(k, v)
 
@@ -223,49 +211,36 @@ class State:
         return self.__alias(k, *args)    
 
 
-    def all(self, pure=False, numeric=False):
+    def all(self, pure=False):
-        """Return list of all unique atomic and alias state strings.
+        """Return list of all unique atomic and alias states.
         
         :rtype: list of ints
         :return: states
         """
         l = []
         for k in dir(self):
-            state = None
             if k[0] == '_':
                 continue
             if k.upper() != k:
                 continue
             if pure:
                 state = self.from_name(k)
-                if not self.is_pure(state):
+                if not self.__is_pure(state):
                     continue
-            if numeric:
+            l.append(k)
-                if state == None:
-                    state = self.from_name(k)
-                l.append(state)
-            else:
-                l.append(k)
         l.sort()
         return l
 
 
-    def elements(self, v, numeric=False, as_string=True):
+    def elements(self, v):
         r = []
         if v == None or v == 0:
             return self.base_state_name
         c = 1
         for i in range(self.__bits):
             if v & c > 0:
-                if numeric:
+                r.append(self.name(c))
-                    r.append(c)
-                else:
-                    r.append(self.name(c))
             c <<= 1
-
-        if numeric or not as_string:
-            return r
-
         return '_' + '.'.join(r)
 
 
@@ -446,7 +421,7 @@ class State:
         :rtype: int
         :returns: Resulting state
         """
-        if not self.is_pure(or_state):
+        if not self.__is_pure(or_state):
             raise ValueError('can only apply using single bit states')
 
         current_state = self.__keys_reverse.get(key)
@@ -461,7 +436,7 @@ class State:
         return self.__move(key, current_state, to_state)
 
 
-    def unset(self, key, not_state, allow_base=False):
+    def unset(self, key, not_state):
         """Unset a single bit, moving to a pure or alias state.
         
         The resulting state cannot be State.base_state_name (0).
@@ -476,7 +451,7 @@ class State:
         :rtype: int
         :returns: Resulting state
         """
-        if not self.is_pure(not_state):
+        if not self.__is_pure(not_state):
             raise ValueError('can only apply using single bit states')
 
         current_state = self.__keys_reverse.get(key)
@@ -487,7 +462,7 @@ class State:
         if to_state == current_state:
             raise ValueError('invalid change for state {}: {}'.format(key, not_state))
 
-        if to_state == getattr(self, self.base_state_name) and not allow_base:
+        if to_state == getattr(self, self.base_state_name):
             raise ValueError('State {} for {} cannot be reverted to {}'.format(current_state, key, self.base_state_name))
 
         new_state = self.__reverse.get(to_state)
@@ -592,7 +567,7 @@ class State:
         state = self.__keys_reverse.get(key)
         if state == None:
             raise StateItemNotFound(key)
-        if not self.is_pure(state):
+        if not self.__is_pure(state):
             raise StateInvalid('cannot run next on an alias state')
        
         if state == 0:
@@ -647,27 +622,3 @@ class State:
         statemask = ~statemask
         statemask &= self.__limit
         return statemask
-
-
-    def purge(self, key):
-        state = self.state(key)
-        state_name = self.name(state)
-
-        v = self.__keys.get(state)
-        v.remove(key) 
-
-        del self.__keys_reverse[key]
-
-        try:
-            del self.__contents[key]
-        except KeyError:
-            pass
-
-        try:
-            del self.modified_last[key]
-        except KeyError:
-            pass
-
-
-    def count(self):
-        return self.__c

shep/store/base.py

@@ -1,19 +0,0 @@
-re_processedname = r'^_?[A-Z\._]*$'
-
-
-class StoreFactory:
-
-    def __del__(self):
-        self.close()
-
-
-    def add(self, k):
-        raise NotImplementedError()
-
-
-    def close(self):
-        pass
-
-
-    def ls(self):
-        raise NotImplementedError()

shep/store/file.py

@@ -1,13 +1,5 @@
 # standard imports
 import os
-import re
-
-# local imports
-from .base import (
-        re_processedname,
-        StoreFactory,
-        )
-from shep.error import StateLockedKey
 
 
 class SimpleFileStore:
@@ -16,43 +8,16 @@ class SimpleFileStore:
     :param path: Filesystem base path for all state directory
     :type path: str
     """
-    def __init__(self, path, binary=False, lock_path=None):
+    def __init__(self, path, binary=False):
         self.__path = path
         os.makedirs(self.__path, exist_ok=True)
         if binary:
             self.__m = ['rb', 'wb']
         else:
             self.__m = ['r', 'w']
-        self.__lock_path = lock_path
-        if self.__lock_path != None:
-            os.makedirs(lock_path, exist_ok=True)
 
 
-    def __lock(self, k):
+    def add(self, k, contents=None):
-        if self.__lock_path == None:
-            return
-        fp = os.path.join(self.__lock_path, k)
-        f = None
-        try:
-            f = open(fp, 'x')
-        except FileExistsError:
-            pass
-        if f == None:
-            raise StateLockedKey(k)
-        f.close()
-
-
-    def __unlock(self, k):
-        if self.__lock_path == None:
-            return
-        fp = os.path.join(self.__lock_path, k)
-        try:
-            os.unlink(fp)
-        except FileNotFoundError:
-            pass
-        
-
-    def put(self, k, contents=None):
         """Add a new key and optional contents 
 
         :param k: Content key to add 
@@ -60,7 +25,6 @@ class SimpleFileStore:
         :param contents: Optional contents to assign for content key
         :type contents: any
         """
-        self.__lock(k)
         fp = os.path.join(self.__path, k)
         if contents == None:
             if self.__m[1] == 'wb':
@@ -71,7 +35,6 @@ class SimpleFileStore:
         f = open(fp, self.__m[1])
         f.write(contents)
         f.close()
-        self.__unlock(k)
 
 
     def remove(self, k):
@@ -81,10 +44,8 @@ class SimpleFileStore:
         :type k: str
         :raises FileNotFoundError: Content key does not exist in the state
         """
-        self.__lock(k)
         fp = os.path.join(self.__path, k)
         os.unlink(fp)
-        self.__unlock(k)
 
     
     def get(self, k):
@@ -96,12 +57,10 @@ class SimpleFileStore:
         :rtype: any
         :return: Contents
         """
-        self.__lock(k)
         fp = os.path.join(self.__path, k)
         f = open(fp, self.__m[0])
         r = f.read()
         f.close()
-        self.__unlock(k)
         return r
 
 
@@ -111,21 +70,15 @@ class SimpleFileStore:
         :rtype: list of str
         :return: Content keys in state
         """
-        self.__lock('.list')
         files = []
         for p in os.listdir(self.__path):
             fp = os.path.join(self.__path, p)
-            f = None
+            f = open(fp, self.__m[0])
-            try:
-                f = open(fp, self.__m[0])
-            except FileNotFoundError:
-                continue
             r = f.read()
             f.close()
             if len(r) == 0:
                 r = None
             files.append((p, r,))
-        self.__unlock('.list')
         return files
 
 
@@ -150,20 +103,16 @@ class SimpleFileStore:
         :param contents: Contents
         :type contents: any
         """
-        self.__lock(k)
         fp = os.path.join(self.__path, k)
         os.stat(fp)
         f = open(fp, self.__m[1])
         r = f.write(contents)
         f.close()
-        self.__unlock(k)
 
 
     def modified(self, k):
-        self.__lock(k)
         path = self.path(k)
         st = os.stat(path)
-        self.__unlock(k)
         return st.st_ctime
 
 
@@ -171,16 +120,15 @@ class SimpleFileStore:
         pass
 
 
-class SimpleFileStoreFactory(StoreFactory):
+class SimpleFileStoreFactory:
     """Provide a method to instantiate SimpleFileStore instances that provide persistence for individual states.
 
     :param path: Filesystem path as base path for states
     :type path: str
     """
-    def __init__(self, path, binary=False, use_lock=False):
+    def __init__(self, path, binary=False):
         self.__path = path
         self.__binary = binary
-        self.__use_lock = use_lock
 
 
     def add(self, k):
@@ -191,22 +139,6 @@ class SimpleFileStoreFactory(StoreFactory):
         :rtype: SimpleFileStore
         :return: A filesystem persistence instance with the given identifier as subdirectory
         """
-        lock_path = None
-        if self.__use_lock:
-            lock_path = os.path.join(self.__path, '.lock')
-
         k = str(k)
         store_path = os.path.join(self.__path, k)
-        return SimpleFileStore(store_path, binary=self.__binary, lock_path=lock_path)
+        return SimpleFileStore(store_path, binary=self.__binary)
-
-
-    def ls(self):
-        r = []
-        for v in os.listdir(self.__path):
-            if re.match(re_processedname, v):
-                r.append(v)
-        return r
-
-
-    def close(self):
-        pass

shep/store/noop.py

@@ -1,44 +0,0 @@
-# local imports
-from .base import StoreFactory
-
-
-class NoopStore:
-
-    def put(self, k, contents=None):
-        pass
-
-
-    def remove(self, k):
-        pass
-
-    def get(self, k):
-        pass
-
-
-    def list(self):
-        return []
-
-
-    def path(self):
-        return None
-
-
-    def replace(self, k, contents):
-        pass
-
-    def modified(self, k):
-        pass
-
-
-    def register_modify(self, k):
-        pass
-
-
-class NoopStoreFactory(StoreFactory):
-
-    def add(self, k):
-        return NoopStore()
-
-
-    def ls(self):
-        return []

shep/store/redis.py

@@ -1,12 +1,6 @@
-# standard imports
-import datetime
-
 # external imports
 import redis
 
-# local imports
-from .base import StoreFactory
-
 
 class RedisStore:
 
@@ -15,13 +9,12 @@ class RedisStore:
         self.__path = path
         self.__binary = binary
 
-
     def __to_path(self, k):
         return '.'.join([self.__path, k])
 
 
     def __from_path(self, s):
-        (left, right) = s.split(b'.', maxsplit=1)
+        (left, right) = s.split('.', maxsplit=1)
         return right
 
 
@@ -31,7 +24,7 @@ class RedisStore:
         return v.decode('utf-8')
 
 
-    def put(self, k, contents=b''):
+    def add(self, k, contents=b''):
         if contents == None:
             contents = b''
         k = self.__to_path(k)
@@ -55,7 +48,7 @@ class RedisStore:
         r = []
         for s in matches:
             k = self.__from_path(s)
-            v = self.redis.get(k)
+            v = self.redis.get(v)
             r.append((k, v,))
 
         return r
@@ -89,9 +82,9 @@ class RedisStore:
         self.redis.set(k)
 
 
-class RedisStoreFactory(StoreFactory):
+class RedisStoreFactory:
 
-    def __init__(self, host='localhost', port=6379, db=2, binary=False):
+    def __init__(self, host='localhost', port=6379, db=0, binary=False):
         self.redis = redis.Redis(host=host, port=port, db=db)
         self.__binary = binary
 
@@ -99,19 +92,3 @@ class RedisStoreFactory(StoreFactory):
     def add(self, k):
         k = str(k)
         return RedisStore(k, self.redis, binary=self.__binary)
-
-
-    def close(self):
-        self.redis.close()
-
-
-    def ls(self):
-        r = []
-        (c, ks) = self.redis.scan(match='*')
-        for k in ks:
-            v = k.rsplit(b'.', maxsplit=1)
-            if v != k:
-                v = v[0].decode('utf-8')
-                if v not in r:
-                    r.append(v)
-        return r

shep/store/rocksdb.py

@@ -1,147 +0,0 @@
-# standard imports
-import datetime
-import os
-
-# external imports
-import rocksdb
-
-# local imports
-from .base import StoreFactory
-
-
-class RocksDbStore:
-
-    def __init__(self, path, db, binary=False):
-        self.db = db
-        self.__path = path
-        self.__binary = binary
-
-
-    def __to_key(self, k):
-        return k.encode('utf-8')
-
-
-    def __to_contents(self, v):
-        if isinstance(v, bytes):
-            return v
-        return v.encode('utf-8')
-
-
-    def __to_path(self, k):
-        return '.'.join([self.__path, k])
-
-
-    def __from_path(self, s):
-        (left, right) = s.split('.', maxsplit=1)
-        return right
-
-
-    def __to_result(self, v):
-        if self.__binary:
-            return v
-        return v.decode('utf-8')
-
-
-    def put(self, k, contents=b''):
-        if contents == None:
-            contents = b''
-        else:
-            contents = self.__to_contents(contents)
-        k = self.__to_path(k)
-        k = self.__to_key(k)
-        self.db.put(k, contents)
-
-
-    def remove(self, k):
-        k = self.__to_path(k)
-        k = self.__to_key(k)
-        self.db.delete(k)
-
-
-    def get(self, k):
-        k = self.__to_path(k)
-        k = self.__to_key(k)
-        v = self.db.get(k)
-        return self.__to_result(v)
-
- 
-    def list(self):
-        it = self.db.iteritems()
-        kb_start = self.__to_key(self.__path)
-        it.seek(kb_start)
-
-        r = []
-        l = len(self.__path)
-        for (kb, v) in it:
-            k = kb.decode('utf-8') 
-            if len(k) < l or k[:l] != self.__path:
-                break
-            k = self.__from_path(k)
-            v = self.db.get(kb)
-            r.append((k, v,))
-
-        return r
-
-
-    def path(self):
-        return None
-
-
-    def replace(self, k, contents):
-        if contents == None:
-            contents = b''
-        else:
-            contents = self.__to_contents(contents)
-        k = self.__to_path(k)
-        k = self.__to_key(k)
-        v = self.db.get(k)
-        if v == None:
-            raise FileNotFoundError(k)
-        self.db.put(k, contents)
-
-
-    def modified(self, k):
-        k = self.__to_path(k)
-        k = '_mod' + k
-        v = self.db.get(k)
-        return int(v)
-
-
-    def register_modify(self, k):
-        k = self.__to_path(k)
-        k = '_mod' + k
-        ts = datetime.datetime.utcnow().timestamp()
-        self.db.set(k)
-
-
-class RocksDbStoreFactory(StoreFactory):
-
-    def __init__(self, path, binary=False):
-        try:
-            os.stat(path)
-        except FileNotFoundError:
-            os.makedirs(path)
-        self.db = rocksdb.DB(path, rocksdb.Options(create_if_missing=True))
-        self.__binary = binary
-
-
-    def add(self, k):
-        k = str(k)
-        return RocksDbStore(k, self.db, binary=self.__binary)
-
-
-    def close(self):
-        self.db.close()
-
-
-    def ls(self):
-        it = self.db.iterkeys()
-        it.seek_to_first()
-        r = []
-        for k in it:
-            v = k.rsplit(b'.', maxsplit=1)
-            if v != k:
-                v = v[0].decode('utf-8')
-                if v not in r:
-                    r.append(v)
-        return r

tests/test_file.py

@@ -2,7 +2,6 @@
 import unittest
 import tempfile
 import os
-import shutil
 
 # local imports
 from shep.persist import PersistedState
@@ -11,7 +10,6 @@ from shep.error import (
         StateExists,
         StateInvalid,
         StateItemExists,
-        StateLockedKey,
         )
 
 
@@ -26,10 +24,6 @@ class TestFileStore(unittest.TestCase):
         self.states.add('baz') 
 
 
-    def tearDown(self):
-        shutil.rmtree(self.d)
-
-
     def test_add(self):
         self.states.put('abcd', state=self.states.FOO, contents='baz')
         fp = os.path.join(self.d, 'FOO', 'abcd')
@@ -182,17 +176,9 @@ class TestFileStore(unittest.TestCase):
         f.write('barbar')
         f.close()
 
-        fp = os.path.join(self.d, 'BAR', 'yyyy')
-        f = open(fp, 'w')
-        f.close()
-
         self.states.sync()
         self.assertEqual(self.states.get('abcd'), None)
-        self.assertEqual(self.states.state('abcd'), self.states.FOO)
         self.assertEqual(self.states.get('zzzz'), 'barbar')
-        self.assertEqual(self.states.state('zzzz'), self.states.BAR)
-        self.assertEqual(self.states.get('yyyy'), None)
-        self.assertEqual(self.states.state('yyyy'), self.states.BAR)
 
 
     def test_path(self):
@@ -243,67 +229,5 @@ class TestFileStore(unittest.TestCase):
         self.assertEqual(r, 'foo')
 
 
-    def test_factory_ls(self):
-        self.states.put('abcd')
-        self.states.put('xxxx', state=self.states.BAZ)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 2)
-
-        self.states.put('yyyy', state=self.states.BAZ)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 2)
-
-        self.states.put('zzzz', state=self.states.BAR)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 3)
-
-
-    def test_lock(self):
-        factory = SimpleFileStoreFactory(self.d, use_lock=True)
-        states = PersistedState(factory.add, 3)
-        states.add('foo') 
-        states.add('bar') 
-        states.add('baz') 
-        states.alias('xyzzy', states.FOO | states.BAR)
-        states.alias('plugh', states.FOO | states.BAR | states.BAZ)
-        states.put('abcd')
-
-        lock_path = os.path.join(self.d, '.lock')
-        os.stat(lock_path)
-
-        fp = os.path.join(self.d, '.lock', 'xxxx')
-        f = open(fp, 'w')
-        f.close()
-        
-        with self.assertRaises(StateLockedKey):
-            states.put('xxxx')
-
-        os.unlink(fp)
-        states.put('xxxx')
-
-        states.set('xxxx', states.FOO)
-        states.set('xxxx', states.BAR)
-        states.replace('xxxx', contents='zzzz')
-
-        fp = os.path.join(self.d, '.lock', 'xxxx')
-        f = open(fp, 'w')
-        f.close()
-
-        with self.assertRaises(StateLockedKey):
-            states.set('xxxx', states.BAZ)
-        
-        v = states.state('xxxx')
-        self.assertEqual(v, states.XYZZY)
-
-        with self.assertRaises(StateLockedKey):
-            states.unset('xxxx', states.FOO)
-
-        with self.assertRaises(StateLockedKey):
-            states.replace('xxxx', contents='yyyy')
-
-        v = states.get('xxxx')
-        self.assertEqual(v, 'zzzz')
-
-
 if __name__ == '__main__':
     unittest.main()

tests/test_noop.py

@@ -1,78 +0,0 @@
-# standard imports
-import unittest
-import os
-import logging
-import sys
-import importlib
-import tempfile
-
-# local imports
-from shep.persist import PersistedState
-from shep.store.noop import NoopStoreFactory
-from shep.error import (
-        StateExists,
-        StateInvalid,
-        StateItemExists,
-        StateItemNotFound,
-        )
-
-logging.basicConfig(level=logging.DEBUG)
-logg = logging.getLogger()
-
-
-class TestNoopStore(unittest.TestCase):
-        
-    def setUp(self):
-        self.factory = NoopStoreFactory()
-        self.states = PersistedState(self.factory.add, 3)
-        self.states.add('foo') 
-        self.states.add('bar') 
-        self.states.add('baz') 
-
-
-    def test_add(self):
-        self.states.put('abcd', state=self.states.FOO, contents='baz')
-        v = self.states.get('abcd')
-        self.assertEqual(v, 'baz')
-        v = self.states.state('abcd')
-        self.assertEqual(v, self.states.FOO)
-
-
-    def test_next(self):
-        self.states.put('abcd')
-
-        self.states.next('abcd')
-        self.assertEqual(self.states.state('abcd'), self.states.FOO)
-        
-        self.states.next('abcd')
-        self.assertEqual(self.states.state('abcd'), self.states.BAR)
-
-        self.states.next('abcd')
-        self.assertEqual(self.states.state('abcd'), self.states.BAZ)
-
-        with self.assertRaises(StateInvalid):
-            self.states.next('abcd')
-
-        v = self.states.state('abcd')
-        self.assertEqual(v, self.states.BAZ)
-
-
-    def test_replace(self):
-        with self.assertRaises(StateItemNotFound):
-            self.states.replace('abcd', contents='foo')
-
-        self.states.put('abcd', state=self.states.FOO, contents='baz')
-        self.states.replace('abcd', contents='bar')
-        v = self.states.get('abcd')
-        self.assertEqual(v, 'bar')
-
-
-    def test_factory_ls(self):
-        self.states.put('abcd')
-        self.states.put('xxxx', state=self.states.BAZ)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 0)
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/test_redis.py

@@ -23,7 +23,6 @@ class TestRedisStore(unittest.TestCase):
     def setUp(self):
         from shep.store.redis import RedisStoreFactory
         self.factory = RedisStoreFactory()
-        self.factory.redis.flushall()
         self.states = PersistedState(self.factory.add, 3)
         self.states.add('foo') 
         self.states.add('bar') 
@@ -67,24 +66,6 @@ class TestRedisStore(unittest.TestCase):
         self.assertEqual(v, 'bar')
 
 
-    def test_factory_ls(self):
-        r = self.factory.ls()
-        self.assertEqual(len(r), 0)
-
-        self.states.put('abcd')
-        self.states.put('xxxx', state=self.states.BAZ)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 2)
-
-        self.states.put('yyyy', state=self.states.BAZ)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 2)
-
-        self.states.put('zzzz', state=self.states.BAR)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 3)
-
-
 if __name__ == '__main__':
     noredis = False
     redis = None

tests/test_rocksdb.py

@@ -1,100 +0,0 @@
-# standard imports
-import unittest
-import os
-import logging
-import sys
-import importlib
-import tempfile
-import shutil
-
-# local imports
-from shep.persist import PersistedState
-from shep.error import (
-        StateExists,
-        StateInvalid,
-        StateItemExists,
-        StateItemNotFound,
-        )
-
-logging.basicConfig(level=logging.DEBUG)
-logg = logging.getLogger()
-
-
-class TestRedisStore(unittest.TestCase):
-        
-    def setUp(self):
-        from shep.store.rocksdb import RocksDbStoreFactory
-        self.d = tempfile.mkdtemp()
-        self.factory = RocksDbStoreFactory(self.d)
-        self.states = PersistedState(self.factory.add, 3)
-        self.states.add('foo') 
-        self.states.add('bar') 
-        self.states.add('baz') 
-
-
-    def tearDown(self):
-        shutil.rmtree(self.d)
-
-
-    def test_add(self):
-        self.states.put('abcd', state=self.states.FOO, contents='baz')
-        v = self.states.get('abcd')
-        self.assertEqual(v, 'baz')
-        v = self.states.state('abcd')
-        self.assertEqual(v, self.states.FOO)
-
-
-    def test_next(self):
-        self.states.put('abcd')
-
-        self.states.next('abcd')
-        self.assertEqual(self.states.state('abcd'), self.states.FOO)
-        
-        self.states.next('abcd')
-        self.assertEqual(self.states.state('abcd'), self.states.BAR)
-
-        self.states.next('abcd')
-        self.assertEqual(self.states.state('abcd'), self.states.BAZ)
-
-        with self.assertRaises(StateInvalid):
-            self.states.next('abcd')
-
-        v = self.states.state('abcd')
-        self.assertEqual(v, self.states.BAZ)
-
-
-    def test_replace(self):
-        with self.assertRaises(StateItemNotFound):
-            self.states.replace('abcd', contents='foo')
-
-        self.states.put('abcd', state=self.states.FOO, contents='baz')
-        self.states.replace('abcd', contents='bar')
-        v = self.states.get('abcd')
-        self.assertEqual(v, 'bar')
-
-
-    def test_factory_ls(self):
-        self.states.put('abcd')
-        self.states.put('xxxx', state=self.states.BAZ)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 2)
-
-        self.states.put('yyyy', state=self.states.BAZ)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 2)
-
-        self.states.put('zzzz', state=self.states.BAR)
-        r = self.factory.ls()
-        self.assertEqual(len(r), 3)
-
-
-if __name__ == '__main__':
-    norocksdb = False
-    rocksdb = None
-    try:
-        importlib.import_module('rocksdb')
-    except ModuleNotFoundError:
-        logg.critical('rocksdb module not available, skipping tests.')
-        sys.exit(0)
-
-    unittest.main()

tests/test_state.py

@@ -7,7 +7,6 @@ from shep import State
 from shep.error import (
         StateExists,
         StateInvalid,
-        StateItemNotFound,
         )
 
 logging.basicConfig(level=logging.DEBUG)
@@ -251,76 +250,5 @@ class TestState(unittest.TestCase):
         self.assertEqual(mask, states.ALL)
 
 
-    def test_remove(self):
-        states = State(1)
-        states.add('foo')
-
-        states.put('xyzzy', contents='plugh')
-        v = states.get('xyzzy')
-        self.assertEqual(v, 'plugh')
-
-        states.next('xyzzy')
-
-        v = states.state('xyzzy')
-        self.assertEqual(states.FOO, v)
-
-        states.purge('xyzzy')
-       
-        with self.assertRaises(StateItemNotFound):
-            states.state('xyzzy')
-
-
-    def test_elements(self):
-        states = State(2)
-        states.add('foo')
-        states.add('bar')
-        states.alias('baz', states.FOO, states.BAR)
-
-        v = states.elements(states.BAZ)
-        self.assertIn('FOO', v)
-        self.assertIn('BAR', v)
-        self.assertIsInstance(v, str)
-
-        v = states.elements(states.BAZ, numeric=True)
-        self.assertIn(states.FOO, v)
-        self.assertIn(states.BAR, v)
-
-        v = states.elements(states.BAZ, as_string=False)
-        self.assertIn('FOO', v)
-        self.assertIn('BAR', v)
-        self.assertNotIsInstance(v, str)
-        self.assertIsInstance(v, list)
-
-
-    def test_count(self):
-        states = State(3)
-        states.add('foo')
-        states.add('bar')
-        self.assertEqual(states.count(), 2)
-        states.add('baz')
-        self.assertEqual(states.count(), 3)
-
-
-    def test_pure(self):
-        states = State(2)
-        states.add('foo')
-        states.add('bar')
-        states.alias('baz', states.FOO, states.BAR)
-
-        v = states.is_pure(states.BAZ)
-        self.assertFalse(v)
-
-        v = states.is_pure(states.FOO)
-        self.assertTrue(v)
-
-
-    def test_default(self):
-        states = State(2, default_state='FOO')
-        with self.assertRaises(StateItemNotFound):
-            states.state('NEW')
-        getattr(states, 'FOO')
-        states.state('FOO')
-
-
 if __name__ == '__main__':
     unittest.main()

tests/test_store.py

@@ -21,7 +21,7 @@ class MockStore:
         self.for_state = 0
 
 
-    def put(self, k, contents=None):
+    def add(self, k, contents=None):
         self.v[k] = contents
 
 
@@ -84,5 +84,6 @@ class TestStateItems(unittest.TestCase):
         self.assertIsNone(self.mockstore.v.get(item))
 
 
+
 if __name__ == '__main__':
     unittest.main()