fix tests for #5655

This commit is contained in:
Wladimir J. van der Laan 2015-01-14 12:45:11 +01:00 committed by Gregory Maxwell
parent 16a5c18cea
commit 56c1093dae
2 changed files with 7 additions and 1 deletions

View file

@ -21,6 +21,9 @@ except ImportError:
import urlparse import urlparse
class HTTPBasicsTest (BitcoinTestFramework): class HTTPBasicsTest (BitcoinTestFramework):
def setup_nodes(self):
return start_nodes(4, self.options.tmpdir, extra_args=[['-rpckeepalive']]*4)
def run_test(self): def run_test(self):
################################################# #################################################

View file

@ -33,8 +33,11 @@ class BitcoinTestFramework(object):
print("Initializing test directory "+self.options.tmpdir) print("Initializing test directory "+self.options.tmpdir)
initialize_chain(self.options.tmpdir) initialize_chain(self.options.tmpdir)
def setup_nodes(self):
return start_nodes(4, self.options.tmpdir)
def setup_network(self, split = False): def setup_network(self, split = False):
self.nodes = start_nodes(4, self.options.tmpdir) self.nodes = self.setup_nodes()
# Connect the nodes as a "chain". This allows us # Connect the nodes as a "chain". This allows us
# to split the network between nodes 1 and 2 to get # to split the network between nodes 1 and 2 to get