Re-factor tests.

Signed-off-by: Sergey Shilov <[email protected]>

Author: Sergey Shilov

plenum/server/node.py

@@ -932,7 +932,7 @@ def onStopping(self):
 
     def closeAllKVStores(self):
         # Clear leveldb lock files
-        logger.debug("{} closing level/rocks dbs".format(self), extra={"cli": False})
+        logger.debug("{} closing key-value storages".format(self), extra={"cli": False})
         for ledgerId in self.ledgerManager.ledgerRegistry:
             state = self.getState(ledgerId)
             if state:

plenum/test/storage/test_leveldb_hash_store.py renamed to plenum/test/storage/test_hash_stores.py

@@ -2,15 +2,18 @@
 
 from ledger.compact_merkle_tree import CompactMerkleTree
 from ledger.ledger import Ledger
-from ledger.test.test_file_hash_store import nodesLeaves, \
-    generateHashes
-
+from ledger.test.test_file_hash_store import nodesLeaves
 from plenum.persistence.leveldb_hash_store import LevelDbHashStore
+from plenum.persistence.rocksdb_hash_store import RocksDbHashStore
+
 
+@pytest.yield_fixture(scope="module", params=['rocksdb', 'leveldb'])
+def hashStore(request, tmpdir_factory):
+    if request.param == 'rocksdb':
+        hs = RocksDbHashStore(tmpdir_factory.mktemp('').strpath)
+    else:
+        hs = LevelDbHashStore(tmpdir_factory.mktemp('').strpath)
 
-@pytest.yield_fixture(scope="module")
-def leveldbHashStore(tdir):
-    hs = LevelDbHashStore(tdir)
     cleanup(hs)
     yield hs
     hs.close()
@@ -21,33 +24,33 @@ def cleanup(hs):
     hs.leafCount = 0
 
 
-def testIndexFrom1(leveldbHashStore):
+def testIndexFrom1(hashStore):
     with pytest.raises(IndexError):
-        leveldbHashStore.readLeaf(0)
+        hashStore.readLeaf(0)
 
 
-def testReadWrite(leveldbHashStore, nodesLeaves):
+def testReadWrite(hashStore, nodesLeaves):
     nodes, leaves = nodesLeaves
     for node in nodes:
-        leveldbHashStore.writeNode(node)
+        hashStore.writeNode(node)
     for leaf in leaves:
-        leveldbHashStore.writeLeaf(leaf)
-    onebyone = [leveldbHashStore.readLeaf(i + 1) for i in range(10)]
-    multiple = leveldbHashStore.readLeafs(1, 10)
+        hashStore.writeLeaf(leaf)
+    onebyone = [hashStore.readLeaf(i + 1) for i in range(10)]
+    multiple = hashStore.readLeafs(1, 10)
     assert onebyone == leaves
     assert onebyone == multiple
 
 
-def testRecoverLedgerFromHashStore(leveldbHashStore, tdir):
-    cleanup(leveldbHashStore)
-    tree = CompactMerkleTree(hashStore=leveldbHashStore)
+def testRecoverLedgerFromHashStore(hashStore, tdir):
+    cleanup(hashStore)
+    tree = CompactMerkleTree(hashStore=hashStore)
     ledger = Ledger(tree=tree, dataDir=tdir)
     for d in range(10):
         ledger.add(str(d).encode())
     updatedTree = ledger.tree
     ledger.stop()
 
-    tree = CompactMerkleTree(hashStore=leveldbHashStore)
+    tree = CompactMerkleTree(hashStore=hashStore)
     restartedLedger = Ledger(tree=tree, dataDir=tdir)
     assert restartedLedger.size == ledger.size
     assert restartedLedger.root_hash == ledger.root_hash