Merge pull request #418 from marcus290/fix-while-loops

RPC tests: Fix while loops of cfund tests causing random test fails

Author: marcus290

qa/rpc-tests/cfund-paymentrequest-state-accept-expired-proposal.py

@@ -58,12 +58,13 @@ def run_test(self):
         assert(self.nodes[0].getpaymentrequest(paymentrequestid0)["status"] == "pending")
         assert(self.nodes[0].cfundstats()["funds"]["locked"] == locked_accepted)
 
+        blocks=slow_gen(self.nodes[0], 1)
+
         # Wait for the proposal to expire
-        while int(time.time()) <= int(self.nodes[0].getproposal(proposalid0)["expiresOn"]):
+        while int(self.nodes[0].getblock(blocks[0])["time"]) <= int(self.nodes[0].getproposal(proposalid0)["expiresOn"]):
+            blocks=slow_gen(self.nodes[0], 1)
             time.sleep(1)
 
-        blocks=slow_gen(self.nodes[0], 1)
-
         assert(self.nodes[0].getproposal(proposalid0)["status"] == "expired waiting for end of voting period")
 
         self.nodes[0].invalidateblock(blocks[-1])

qa/rpc-tests/cfund-proposal-state-accept.py

@@ -154,12 +154,13 @@ def run_test(self):
         self.nodes[0].invalidateblock(blocks[-1])
         assert(self.nodes[0].getproposal(proposalid0)["votingCycle"] == votingCycle_after_state_change)
 
+        blocks=slow_gen(self.nodes[0], 1)
+
         # Wait for the proposal to expire
-        while int(time.time()) <= int(self.nodes[0].getproposal(proposalid0)["expiresOn"]):
+        while int(self.nodes[0].getblock(blocks[0])["time"]) <= int(self.nodes[0].getproposal(proposalid0)["expiresOn"]):
+            blocks=slow_gen(self.nodes[0], 1)
             time.sleep(1)
 
-        blocks=slow_gen(self.nodes[0], 1)
-
         assert(self.nodes[0].getproposal(proposalid0)["status"] == "expired waiting for end of voting period")
 
         self.nodes[0].invalidateblock(blocks[-1])