[Tests] fake_stake: test03 updated

random-zebra · random-zebra · commit c6c81a7cd20a · 2019-02-14T18:06:01.000+01:00
diff --git a/test/functional/fake_stake/base_test.py b/test/functional/fake_stake/base_test.py
@@ -341,6 +341,7 @@ def test_spam(self, name, stakingPrevOuts,
             time.sleep(1)
 
             try:
+                self.test_nodes[0].handle_connect()
                 self.test_nodes[0].send_message(msg)
                 time.sleep(2)
                 block_ret = self.node.getblock(block.hash)
@@ -366,6 +367,11 @@ def test_spam(self, name, stakingPrevOuts,
                     self.log.warning(exc_msg)
                     err_msgs.append(exc_msg)
 
+            except Exception as e:
+                exc_msg = str(e)
+                self.log.error(exc_msg)
+                err_msgs.append(exc_msg)
+
             # remove a random prevout from the list
             # (to randomize block creation if the same height is picked two times)
             del stakingPrevOuts[choice(list(stakingPrevOuts))]
diff --git a/test/functional/fake_stake/test03.py b/test/functional/fake_stake/test03.py
@@ -11,18 +11,17 @@
 from test_framework.authproxy import JSONRPCException
 
 from base_test import PIVX_FakeStakeTest
-from util import mints_to_stakingPrevOuts
 
 class Test_03(PIVX_FakeStakeTest):
 
     def run_test(self):
         self.description = "Covers the scenario of a zPoS block where the coinstake input is a zerocoin spend of an already spent coin."
         self.init_test()
 
-        DENOM_TO_USE = 5000 # zc denomination
-        INITAL_MINED_BLOCKS = 321
-        MORE_MINED_BLOCKS = 301
-        self.NUM_BLOCKS = 2
+        DENOM_TO_USE = 5000         # zc denomination
+        INITAL_MINED_BLOCKS = 321   # First mined blocks (rewards collected to mint)
+        MORE_MINED_BLOCKS = 301     # More blocks mined before spending zerocoins
+        self.NUM_BLOCKS = 2         # Number of spammed blocks
 
         # 1) Starting mining blocks
         self.log.info("Mining %d blocks to get to zPOS activation...." % INITAL_MINED_BLOCKS)
@@ -58,7 +57,7 @@ def run_test(self):
         sleep(2)
         mints = self.node.listmintedzerocoins(True, True)
         sleep(1)
-        stakingPrevOuts = mints_to_stakingPrevOuts(mints)
+        stakingPrevOuts = self.get_prevouts(mints, zpos=True)
         mints_hashes = [x["serial hash"] for x in mints]
 
         # This mints are not ready spendable, only few of them.
@@ -96,4 +95,10 @@ def run_test(self):
 
         # 7) Create "Fake Stake" blocks and send them
         self.log.info("Creating Fake stake zPoS blocks...")
-        self.test_spam("Main", stakingPrevOuts, spendingPrevOuts=spendingPrevOuts, fZPoS=True)
+        err_msgs = self.test_spam("Main", stakingPrevOuts, spendingPrevOuts=spendingPrevOuts, fZPoS=True)
+
+        if not len(err_msgs) == 0:
+            self.log.error("result: " + " | ".join(err_msgs))
+            raise AssertionError("TEST FAILED")
+
+        self.log.info("%s PASSED" % self.__class__.__name__)
