WIP

Author: fjahr

test/functional/feature_block.py

@@ -761,7 +761,7 @@ def run_test(self):
         self.send_blocks([b56p2], success=False, reject_reason='bad-txns-duplicate', reconnect=True)
 
         self.move_tip("57p2")
-        self.send_blocks([b57p2], True)
+        self.send_blocks([b57p2], True, timeout=180)
 
         self.move_tip(57)
         self.send_blocks([b57], False)  # The tip is not updated because 57p2 seen first

test/functional/test_framework/test_framework.py

@@ -569,7 +569,7 @@ def cache_path(*paths):
 
             os.rmdir(cache_path('wallets'))  # Remove empty wallets dir
             for entry in os.listdir(cache_path()):
-                if entry not in ['chainstate', 'blocks']:  # Only keep chainstate and blocks folder
+                if entry not in ['chainstate', 'blocks', 'indexes']:  # Only indexes, chainstate and blocks folders
                     os.remove(cache_path(entry))
 
         for i in range(self.num_nodes):