Merge pull request bitcoin#229 from ptschip/release_bip9softforks

Release Branch - Comptool fix for the requestmanager re-request interval

qa/rpc-tests/test_framework/comptool.py

@@ -249,6 +249,7 @@ def transaction_requested():
     # with the expected outcome (if given)
     def check_results(self, blockhash, outcome):
         with mininode_lock:
+
             for c in self.connections:
                 if outcome is None:
                     if c.cb.bestblockhash != self.connections[0].cb.bestblockhash:
@@ -267,10 +268,19 @@ def check_results(self, blockhash, outcome):
                 elif ((c.cb.bestblockhash == blockhash) != outcome):
                     print("Node ", c.addr, " has best block ", hex(c.cb.bestblockhash), ". Expecting ", hex(blockhash), outcome)
                     print("Quick   RPC returns", c.rpc.getbestblockhash())
-                    time.sleep(5)
+                    time.sleep(5) #wait the requestmanager re-request interval to see if the block shows up
                     print("Delayed RPC returns", c.rpc.getbestblockhash())
+
+                    rpcblock =  c.rpc.getbestblockhash()
+                    block = hex(blockhash)[2:]
+                    #sometimes a leading zero or two are missing from the blockhash. Replace these.
+                    while (len(block) < 64):
+                        block = '0' + block
+                    if rpcblock == block:
+                        return True
+                    else:
 		    # pdb.set_trace()
-                    return False
+                        return False
             return True
 
     # Either check that the mempools all agree with each other, or that