This adds a helper method wait_until_stopped to the TestNode class. This should prevent numerous time.sleep() over all places.
Additionally, the timeout behavior is restored. (Was removed by the introduction of TestNode.)
This should prevent tests from running indefinitely by accident.
Concept ACK, but I'm concerned about defining a wait_until in util.py, when there's already a wait_until defined in mininode.py. This is a problem since wildcard imports are used in a lot of tests, so behavior will be unpredictable.
Looks great. Tested ACK fa7d395048c9395bbf23439c2986751db560aa8b
Solved merge conflict fa7d39504 ... fa72a0011
137 | + 138 | + # process has stopped. Assert that it didn't return an error code. 139 | + assert_equal(return_code, 0) 140 | + self.running = False 141 | + self.process = None 142 | + self.rpc_connected = False
I think this method should also set self.rpc to None
@jnewbery Done
Tested ACK fa72a0011bead99f60e6442b79ddad407d3a3df2.
One nit inline. Otherwise looks good.
16 | @@ -17,9 +17,12 @@ 17 | assert_equal, 18 | get_rpc_proxy, 19 | rpc_url, 20 | + wait_until, 21 | ) 22 | from .authproxy import JSONRPCException 23 | 24 | +BITCOIND_PROC_WAIT_TIMEOUT = 60
This constant is now only used in one place. Perhaps remove it as a constant and add it as an integer literal in the definition of wait_until_stopped() with a comment.
If not, perhaps move this constant assignment down to just above the call to wait_until_stopped()
I prefer to put constants at the top of a file and my personal taste is that it is ugly to place them between or inside methods/functions.
That's reasonable
utACK faa8d9581affde35a8242c63fca8a52004d4f943