Add data_dir_path override in testNodeClass init

Dmitry Surnin · Dmitry Surnin · commit b13c6a770380 · 2017-09-25T09:55:44.000+03:00
diff --git a/plenum/test/conftest.py b/plenum/test/conftest.py
@@ -730,6 +730,7 @@ def txnPoolNodeSet(patchPluginManager,
             node = exitStack.enter_context(
                 testNodeClass(nm,
                               basedirpath=tdirWithPoolTxns,
+                              base_data_dir=tdirWithPoolTxns,
                               config=tconf,
                               pluginPaths=allPluginsPath))
             txnPoolNodesLooper.add(node)
@@ -814,7 +815,7 @@ def testNode(pluginManager, tdir):
     nodeReg = genNodeReg(names=[name])
     ha, cliname, cliha = nodeReg[name]
     node = TestNode(name=name, ha=ha, cliname=cliname, cliha=cliha,
-                    nodeRegistry=copy(nodeReg), basedirpath=tdir,
+                    nodeRegistry=copy(nodeReg), basedirpath=tdir, base_data_dir=tdir,
                     primaryDecider=None, pluginPaths=None, seed=randomSeed())
     node.start(None)
     yield node
diff --git a/plenum/test/node_catchup/conftest.py b/plenum/test/node_catchup/conftest.py
@@ -53,6 +53,10 @@ def nodeCreatedAfterSomeTxns(looper, txnPoolNodeSet,
         newStewardWallet
 
 
+def test_tt(nodeCreatedAfterSomeTxns):
+    pass
+
+
 @pytest.fixture("module")
 def nodeSetWithNodeAddedAfterSomeTxns(
         txnPoolNodeSet, nodeCreatedAfterSomeTxns):
@@ -115,3 +119,7 @@ def poolAfterSomeTxns(
                                         client,
                                         txnCount)
     yield looper, client, wallet
+
+
+def test_trtr(poolAfterSomeTxns):
+    pass
diff --git a/plenum/test/node_catchup/test_node_catchup_after_restart_after_txns.py b/plenum/test/node_catchup/test_node_catchup_after_restart_after_txns.py
@@ -64,6 +64,7 @@ def test_node_catchup_after_restart_with_txns(
     newNode = TestNode(
         newNode.name,
         basedirpath=tdirWithPoolTxns,
+        base_data_dir=tdirWithPoolTxns,
         config=tconf,
         ha=nodeHa,
         cliha=nodeCHa,
diff --git a/plenum/test/node_catchup/test_node_catchup_after_restart_no_txns.py b/plenum/test/node_catchup/test_node_catchup_after_restart_no_txns.py
@@ -49,6 +49,7 @@ def test_node_catchup_after_restart_no_txns(
     new_node = TestNode(
         new_node.name,
         basedirpath=tdirWithPoolTxns,
+        base_data_dir=tdirWithPoolTxns,
         config=tconf,
         ha=nodeHa,
         cliha=nodeCHa,
diff --git a/plenum/test/pool_transactions/helper.py b/plenum/test/pool_transactions/helper.py
@@ -110,7 +110,7 @@ def start_newly_added_node(
         auto_start,
         plugin_path,
         nodeClass):
-    node = nodeClass(node_name, basedirpath=tdir, config=conf,
+    node = nodeClass(node_name, basedirpath=tdir, base_data_dir=tdir, config=conf,
                      ha=node_ha, cliha=client_ha,
                      pluginPaths=plugin_path)
     if auto_start:
@@ -192,7 +192,7 @@ def updateNodeDataAndReconnect(looper, steward, stewardWallet, node,
     client_ip = node_data.get(CLIENT_IP, None) or node.clientstack.ha.host
     client_port = node_data.get(CLIENT_PORT, None) or node.clientstack.ha.port
     looper.removeProdable(name=node.name)
-    restartedNode = TestNode(node_alias, basedirpath=tdirWithPoolTxns,
+    restartedNode = TestNode(node_alias, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                              config=tconf,
                              ha=HA(node_ip, node_port),
                              cliha=HA(client_ip, client_port))
diff --git a/plenum/test/pool_transactions/test_change_ha_persists_post_nodes_restart.py b/plenum/test/pool_transactions/test_change_ha_persists_post_nodes_restart.py
@@ -44,14 +44,14 @@ def testChangeHaPersistsPostNodesRestart(looper, txnPoolNodeSet,
     # what happens when starting the node with script
     restartedNodes = []
     for node in txnPoolNodeSet[:-1]:
-        restartedNode = TestNode(node.name, basedirpath=tdirWithPoolTxns,
+        restartedNode = TestNode(node.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                                  config=tconf, ha=node.nodestack.ha,
                                  cliha=node.clientstack.ha)
         looper.add(restartedNode)
         restartedNodes.append(restartedNode)
 
     # Starting the node whose HA was changed
-    node = TestNode(newNode.name, basedirpath=tdirWithPoolTxns, config=tconf,
+    node = TestNode(newNode.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns, config=tconf,
                     ha=nodeNewHa, cliha=clientNewHa)
     looper.add(node)
     restartedNodes.append(node)
diff --git a/plenum/test/pool_transactions/test_client_with_pool_txns.py b/plenum/test/pool_transactions/test_client_with_pool_txns.py
@@ -71,7 +71,7 @@ def testClientConnectToRestartedNodes(looper, txnPoolNodeSet, tdirWithPoolTxns,
     # looper.run(newClient.ensureDisconnectedToNodes(timeout=60))
     txnPoolNodeSet = []
     for nm in poolTxnNodeNames:
-        node = TestNode(nm, basedirpath=tdirWithPoolTxns,
+        node = TestNode(nm, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                         config=tconf, pluginPaths=allPluginsPath)
         looper.add(node)
         txnPoolNodeSet.append(node)
diff --git a/plenum/test/pool_transactions/test_nodes_ha_change_back.py b/plenum/test/pool_transactions/test_nodes_ha_change_back.py
@@ -45,7 +45,7 @@ def testChangeNodeHaBack(looper, txnPoolNodeSet, tdirWithPoolTxns,
 
     # In order to save the time the pool connection is not maintaining
     # during the steps, only the final result is checked.
-    restartedNode = TestNode(theta.name, basedirpath=tdirWithPoolTxns,
+    restartedNode = TestNode(theta.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                              config=tconf, ha=correctNodeHa, cliha=clientHa)
     looper.add(restartedNode)
     txnPoolNodeSet[-1] = restartedNode
diff --git a/plenum/test/pool_transactions/test_suspend_node.py b/plenum/test/pool_transactions/test_suspend_node.py
@@ -75,7 +75,7 @@ def testStewardSuspendsNode(looper, txnPoolNodeSet,
                            if not n.hasPrimary][0]
     oldNode.stop()
     looper.removeProdable(oldNode)
-    oldNode = TestNode(oldNode.name, basedirpath=tdirWithPoolTxns,
+    oldNode = TestNode(oldNode.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                        config=tconf, pluginPaths=allPluginsPath)
     looper.add(oldNode)
     txnPoolNodeSet[oldNodeIdx] = oldNode
@@ -86,7 +86,7 @@ def testStewardSuspendsNode(looper, txnPoolNodeSet,
     # nodes and clients can also connect to that node
     cancelNodeSuspension(looper, newSteward, newStewardWallet, newNodeNym,
                          newNode.name)
-    nodeTheta = TestNode(newNode.name, basedirpath=tdirWithPoolTxns,
+    nodeTheta = TestNode(newNode.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                          config=tconf, pluginPaths=allPluginsPath,
                          ha=newNode.nodestack.ha, cliha=newNode.clientstack.ha)
     looper.add(nodeTheta)
diff --git a/plenum/test/pool_transactions/test_z_node_key_changed.py b/plenum/test/pool_transactions/test_z_node_key_changed.py
@@ -42,7 +42,7 @@ def testNodeKeysChanged(looper, txnPoolNodeSet, tdirWithPoolTxns,
                               override=True)
 
     logger.debug("{} starting with HAs {} {}".format(newNode, nodeHa, nodeCHa))
-    node = TestNode(newNode.name, basedirpath=tdirWithPoolTxns, config=tconf,
+    node = TestNode(newNode.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns, config=tconf,
                     ha=nodeHa, cliha=nodeCHa, pluginPaths=allPluginsPath)
     looper.add(node)
     # The last element of `txnPoolNodeSet` is the node Theta that was just
diff --git a/plenum/test/primary_selection/test_primary_selection_after_primary_demotion_and_pool_restart.py b/plenum/test/primary_selection/test_primary_selection_after_primary_demotion_and_pool_restart.py
@@ -47,7 +47,7 @@ def test_primary_selection_after_primary_demotion_and_pool_restart(looper,
     # what happens when starting the node with script
     restartedNodes = []
     for node in txnPoolNodeSet:
-        restartedNode = TestNode(node.name, basedirpath=tdirWithPoolTxns,
+        restartedNode = TestNode(node.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                                  config=tconf, ha=node.nodestack.ha,
                                  cliha=node.clientstack.ha)
         looper.add(restartedNode)
diff --git a/plenum/test/script/helper.py b/plenum/test/script/helper.py
@@ -56,7 +56,7 @@ def changeNodeHa(looper, txnPoolNodeSet, tdirWithPoolTxns,
     looper.removeProdable(subjectedNode)
 
     # start node with new HA
-    restartedNode = TestNode(subjectedNode.name, basedirpath=tdirWithPoolTxns,
+    restartedNode = TestNode(subjectedNode.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                              config=tconf, ha=nodeStackNewHA,
                              cliha=clientStackNewHA)
     looper.add(restartedNode)
diff --git a/plenum/test/test_node.py b/plenum/test/test_node.py
@@ -436,6 +436,7 @@ def addNode(self, name: str) -> TestNode:
                           cliha=cliha,
                           nodeRegistry=copy(self.nodeReg),
                           basedirpath=self.tmpdir,
+                          base_data_dir=self.tmpdir,
                           primaryDecider=self.primaryDecider,
                           pluginPaths=self.pluginPaths,
                           seed=seed))
diff --git a/plenum/test/test_node_connection.py b/plenum/test/test_node_connection.py
@@ -59,7 +59,7 @@ def testNodesConnectsWhenOneNodeIsLate(allPluginsPath, tdirAndLooper,
     logger.debug("Node names: {}".format(names))
 
     def create(name):
-        node = TestNode(name, nodeReg, basedirpath=tdir,
+        node = TestNode(name, nodeReg, basedirpath=tdir, base_data_dir=tdir,
                         pluginPaths=allPluginsPath)
         nodes.append(node)
         return node
@@ -97,7 +97,7 @@ def testNodesConnectWhenTheyAllStartAtOnce(allPluginsPath, tdirAndLooper,
     initLocalKeys(tdir, nodeReg)
 
     for name in nodeReg:
-        node = TestNode(name, nodeReg, basedirpath=tdir,
+        node = TestNode(name, nodeReg, basedirpath=tdir, base_data_dir=tdir,
                         pluginPaths=allPluginsPath)
         nodes.append(node)
 
@@ -130,7 +130,7 @@ def testNodesComingUpAtDifferentTimes(allPluginsPath, tdirAndLooper,
     rwaits = [randint(1, 10) for _ in names]
 
     for name in names:
-        node = TestNode(name, nodeReg, basedirpath=tdir,
+        node = TestNode(name, nodeReg, basedirpath=tdir, base_data_dir=tdir,
                         pluginPaths=allPluginsPath)
         nodes.append(node)
 
@@ -172,7 +172,7 @@ def testNodeConnection(allPluginsPath, tdirAndLooper, nodeReg):
     logger.debug(names)
     nodes = []
     for name in names:
-        node = TestNode(name, nrg, basedirpath=tdir,
+        node = TestNode(name, nrg, basedirpath=tdir, base_data_dir=tdir,
                         pluginPaths=allPluginsPath)
         nodes.append(node)
 
@@ -208,7 +208,7 @@ def testNodeRemoveUnknownRemote(allPluginsPath, tdirAndLooper, nodeReg, conf):
 
     nodes = []
     for name in names:
-        node = TestNode(name, nrg, basedirpath=tdir,
+        node = TestNode(name, nrg, basedirpath=tdir, base_data_dir=tdir,
                         pluginPaths=allPluginsPath)
         nodes.append(node)
 
@@ -222,7 +222,7 @@ def testNodeRemoveUnknownRemote(allPluginsPath, tdirAndLooper, nodeReg, conf):
 
     initLocalKeys(tdir, {"Gamma": nodeReg["Gamma"]})
     C = TestNode("Gamma", {**nrg, **{"Gamma": nodeReg["Gamma"]}},
-                 basedirpath=tdir, pluginPaths=allPluginsPath)
+                 basedirpath=tdir, base_data_dir=tdir, pluginPaths=allPluginsPath)
     for node in nodes:
         tellKeysToOthers(node, [C, ])
 
diff --git a/plenum/test/test_performance.py b/plenum/test/test_performance.py
@@ -227,6 +227,7 @@ def test_node_load_after_add_then_disconnect(newNodeCaughtUp, txnPoolNodeSet,
     new_node = TestNode(
         new_node.name,
         basedirpath=tdirWithPoolTxns,
+        base_data_dir=tdirWithPoolTxns,
         config=tconf,
         ha=nodeHa,
         cliha=nodeCHa,
@@ -295,7 +296,7 @@ def test_node_load_after_disconnect(looper, txnPoolNodeSet, tconf,
                   format(i + 1, txns_per_batch, perf_counter() - s))
 
     nodeHa, nodeCHa = HA(*x.nodestack.ha), HA(*x.clientstack.ha)
-    newNode = TestNode(x.name, basedirpath=tdirWithPoolTxns, config=tconf,
+    newNode = TestNode(x.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns, config=tconf,
                        ha=nodeHa, cliha=nodeCHa, pluginPaths=allPluginsPath)
     looper.add(newNode)
     txnPoolNodeSet[-1] = newNode
diff --git a/plenum/test/test_state_regenerated_from_ledger.py b/plenum/test/test_state_regenerated_from_ledger.py
@@ -43,7 +43,7 @@ def test_state_regenerated_from_ledger(
 
     shutil.rmtree(state_db_path)
 
-    restarted_node = TestNode(node_to_stop.name, basedirpath=tdirWithPoolTxns,
+    restarted_node = TestNode(node_to_stop.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                               config=tconf, ha=nodeHa, cliha=nodeCHa,
                               pluginPaths=allPluginsPath)
     looper.add(restarted_node)
diff --git a/plenum/test/view_change/helper.py b/plenum/test/view_change/helper.py
@@ -213,7 +213,7 @@ def start_stopped_node(stopped_node, looper, tconf,
     nodeHa, nodeCHa = HA(*
                          stopped_node.nodestack.ha), HA(*
                                                         stopped_node.clientstack.ha)
-    restarted_node = TestNode(stopped_node.name, basedirpath=tdirWithPoolTxns,
+    restarted_node = TestNode(stopped_node.name, basedirpath=tdirWithPoolTxns, base_data_dir=tdirWithPoolTxns,
                               config=tconf,
                               ha=nodeHa, cliha=nodeCHa,
                               pluginPaths=allPluginsPath)
diff --git a/plenum/test/zstack_tests/test_zstack_reconnection.py b/plenum/test/zstack_tests/test_zstack_reconnection.py
@@ -50,6 +50,7 @@ def checkFlakyConnected(conn=True):
     node = TestNode(
         nodeToCrash.name,
         basedirpath=tdirWithPoolTxns,
+        base_data_dir=tdirWithPoolTxns,
         config=tconf,
         ha=nodeToCrash.nodestack.ha,
         cliha=nodeToCrash.clientstack.ha)
