Rev3462, Fix ConnectionServer testcases
This commit is contained in:
parent
4843719c58
commit
597c5063f3
3 changed files with 13 additions and 3 deletions
|
@ -10,7 +10,7 @@ class Config(object):
|
||||||
|
|
||||||
def __init__(self, argv):
|
def __init__(self, argv):
|
||||||
self.version = "0.6.2"
|
self.version = "0.6.2"
|
||||||
self.rev = 3461
|
self.rev = 3462
|
||||||
self.argv = argv
|
self.argv = argv
|
||||||
self.action = None
|
self.action = None
|
||||||
self.config_file = "zeronet.conf"
|
self.config_file = "zeronet.conf"
|
||||||
|
|
|
@ -163,7 +163,12 @@ class TestSiteDownload:
|
||||||
site_full = Site("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT")
|
site_full = Site("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT")
|
||||||
file_server_full = FileServer("127.0.0.1", 1546)
|
file_server_full = FileServer("127.0.0.1", 1546)
|
||||||
site_full.connection_server = file_server_full
|
site_full.connection_server = file_server_full
|
||||||
gevent.spawn(lambda: ConnectionServer.start(file_server_full))
|
|
||||||
|
def listen():
|
||||||
|
ConnectionServer.start(file_server_full)
|
||||||
|
ConnectionServer.listen(file_server_full)
|
||||||
|
|
||||||
|
gevent.spawn(listen)
|
||||||
time.sleep(0.001) # Port opening
|
time.sleep(0.001) # Port opening
|
||||||
file_server_full.sites[site_full.address] = site_full # Add site
|
file_server_full.sites[site_full.address] = site_full # Add site
|
||||||
site_full.storage.verifyFiles(quick_check=True) # Check optional files
|
site_full.storage.verifyFiles(quick_check=True) # Check optional files
|
||||||
|
|
|
@ -216,7 +216,12 @@ def site_url():
|
||||||
def file_server(request):
|
def file_server(request):
|
||||||
request.addfinalizer(CryptConnection.manager.removeCerts) # Remove cert files after end
|
request.addfinalizer(CryptConnection.manager.removeCerts) # Remove cert files after end
|
||||||
file_server = FileServer("127.0.0.1", 1544)
|
file_server = FileServer("127.0.0.1", 1544)
|
||||||
gevent.spawn(lambda: ConnectionServer.start(file_server))
|
|
||||||
|
def listen():
|
||||||
|
ConnectionServer.start(file_server)
|
||||||
|
ConnectionServer.listen(file_server)
|
||||||
|
|
||||||
|
gevent.spawn(listen)
|
||||||
# Wait for port opening
|
# Wait for port opening
|
||||||
for retry in range(10):
|
for retry in range(10):
|
||||||
time.sleep(0.1) # Port opening
|
time.sleep(0.1) # Port opening
|
||||||
|
|
Loading…
Reference in a new issue