test

Author: ComputerCraftr

test/functional/p2p_ibd_stalling.py

@@ -84,7 +84,10 @@ def run_test(self):
         # returning the number of downloaded (but not connected) blocks.
         bytes_recv = 150003 if not self.options.v2transport else 146934
         # Verify with: awk '/received: block/ {gsub("\\(", ""); sum+=$13} END{print sum}' log.txt
-        self.wait_until(lambda: self.total_bytes_recv_for_blocks() == bytes_recv)
+        def test() -> bool:
+            self.log.info('self.total_bytes_recv_for_blocks=' + self.total_bytes_recv_for_blocks())
+            return self.total_bytes_recv_for_blocks() == bytes_recv
+        self.wait_until(test, 10, 10)
 
         self.all_sync_send_with_ping(peers)
         # If there was a peer marked for stalling, it would get disconnected

test/functional/p2p_invalid_tx.py

@@ -165,7 +165,7 @@ def run_test(self):
             node.p2ps[0].send_txs_and_test([rejected_parent], node, success=False)
 
         self.log.info('Test that a peer disconnection causes erase its transactions from the orphan pool')
-        with node.assert_debug_log(expected_msgs=['Erased 100 orphan transaction(s) from peer=[0-9]+'], with_regex=True):
+        with node.assert_debug_log(['Erased 100 orphan transaction(s) from peer=']):
             self.reconnect_p2p(num_connections=1)
 
         self.log.info('Test that a transaction in the orphan pool is included in a new tip block causes erase this transaction from the orphan pool')

test/functional/test_framework/test_node.py

@@ -488,7 +488,7 @@ def debug_log_size(self, **kwargs) -> int:
             return dl.tell()
 
     @contextlib.contextmanager
-    def assert_debug_log(self, expected_msgs, unexpected_msgs=None, timeout=2, with_regex=False):
+    def assert_debug_log(self, expected_msgs, unexpected_msgs=None, timeout=2):
         if unexpected_msgs is None:
             unexpected_msgs = []
         assert_equal(type(expected_msgs), list)
@@ -506,14 +506,10 @@ def assert_debug_log(self, expected_msgs, unexpected_msgs=None, timeout=2, with_
                 log = dl.read()
             print_log = " - " + "\n - ".join(log.splitlines())
             for unexpected_msg in unexpected_msgs:
-                if not with_regex:
-                    unexpected_msg = re.escape(unexpected_msg)
-                if re.search(unexpected_msg, log, flags=re.MULTILINE):
+                if re.search(re.escape(unexpected_msg), log, flags=re.MULTILINE):
                     self._raise_assertion_error('Unexpected message "{}" partially matches log:\n\n{}\n\n'.format(unexpected_msg, print_log))
             for expected_msg in expected_msgs:
-                if not with_regex:
-                    expected_msg = re.escape(expected_msg)
-                if re.search(expected_msg, log, flags=re.MULTILINE) is None:
+                if re.search(re.escape(expected_msg), log, flags=re.MULTILINE) is None:
                     found = False
             if found:
                 return