Merge #7803: [qa] maxblocksinflight: Actually enable test

fac724c [qa] maxblocksinflight: Actually enable test (MarcoFalke)

qa/rpc-tests/maxblocksinflight.py

@@ -41,40 +41,36 @@ class TestManager(NodeConnCB):
         self.disconnectOkay = False
 
     def run(self):
-        try:
+        self.connection.rpc.generate(1)  # Leave IBD
-            fail = False
+
-            self.connection.rpc.generate(1) # Leave IBD
+        numBlocksToGenerate = [8, 16, 128, 1024]
-
+        for count in range(len(numBlocksToGenerate)):
-            numBlocksToGenerate = [ 8, 16, 128, 1024 ]
+            current_invs = []
-            for count in range(len(numBlocksToGenerate)):
+            for i in range(numBlocksToGenerate[count]):
-                current_invs = []
+                current_invs.append(CInv(2, random.randrange(0, 1 << 256)))
-                for i in range(numBlocksToGenerate[count]):
+                if len(current_invs) >= 50000:
-                    current_invs.append(CInv(2, random.randrange(0, 1<<256)))
-                    if len(current_invs) >= 50000:
-                        self.connection.send_message(msg_inv(current_invs))
-                        current_invs = []
-                if len(current_invs) > 0:
                     self.connection.send_message(msg_inv(current_invs))
-                
+                    current_invs = []
-                # Wait and see how many blocks were requested
+            if len(current_invs) > 0:
-                time.sleep(2)
+                self.connection.send_message(msg_inv(current_invs))
-
+
-                total_requests = 0
+            # Wait and see how many blocks were requested
-                with mininode_lock:
+            time.sleep(2)
-                    for key in self.blockReqCounts:
+
-                        total_requests += self.blockReqCounts[key]
+            total_requests = 0
-                        if self.blockReqCounts[key] > 1:
+            with mininode_lock:
-                            raise AssertionError("Error, test failed: block %064x requested more than once" % key)
+                for key in self.blockReqCounts:
-                if total_requests > MAX_REQUESTS:
+                    total_requests += self.blockReqCounts[key]
-                    raise AssertionError("Error, too many blocks (%d) requested" % total_requests)
+                    if self.blockReqCounts[key] > 1:
-                print "Round %d: success (total requests: %d)" % (count, total_requests)
+                        raise AssertionError("Error, test failed: block %064x requested more than once" % key)
-        except AssertionError as e:
+            if total_requests > MAX_REQUESTS:
-            print "TEST FAILED: ", e.args
+                raise AssertionError("Error, too many blocks (%d) requested" % total_requests)
+            print "Round %d: success (total requests: %d)" % (count, total_requests)
 
         self.disconnectOkay = True
         self.connection.disconnect_node()
 
-        
+
 class MaxBlocksInFlightTest(BitcoinTestFramework):
     def add_options(self, parser):
         parser.add_option("--testbinary", dest="testbinary",
@@ -86,7 +82,7 @@ class MaxBlocksInFlightTest(BitcoinTestFramework):
         initialize_chain_clean(self.options.tmpdir, 1)
 
     def setup_network(self):
-        self.nodes = start_nodes(1, self.options.tmpdir, 
+        self.nodes = start_nodes(1, self.options.tmpdir,
                                  extra_args=[['-debug', '-whitelist=127.0.0.1']],
                                  binary=[self.options.testbinary])