ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 13:07:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Turn web service back on in test for Python 3

Browse Source
This commit is contained in:
Chad Whitacre 2020-11-06 19:44:08 -05:00
parent eab228f22a
commit fe07078859
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/allmydata/test/no_network.py
View File

@ -20,7 +20,7 @@ from __future__ import unicode_literals
# Tubs, so it is not useful for tests that involve a Helper or the # Tubs, so it is not useful for tests that involve a Helper or the
# control.furl . # control.furl .
from future.utils import PY2, PY3 from future.utils import PY2
if PY2: if PY2:
from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401 from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401
from past.builtins import unicode from past.builtins import unicode
@ -294,10 +294,6 @@ class _NoNetworkClient(_Client):
pass pass
#._servers will be set by the NoNetworkGrid which creates us #._servers will be set by the NoNetworkGrid which creates us
if PY3:
def init_web(self, *args, **kwargs):
print("Web service is temporarily disabled until nevow is gone.")
class SimpleStats(object): class SimpleStats(object):
def __init__(self): def __init__(self):
@ -504,12 +500,10 @@ class GridTestMixin(object):
def _record_webports_and_baseurls(self): def _record_webports_and_baseurls(self):
self.g._check_clients() self.g._check_clients()
if PY2: self.client_webports = [c.getServiceNamed("webish").getPortnum()
# Temporarily disabled on Python 3 until Nevow is gone: for c in self.g.clients]
self.client_webports = [c.getServiceNamed("webish").getPortnum() self.client_baseurls = [c.getServiceNamed("webish").getURL()
for c in self.g.clients] for c in self.g.clients]
self.client_baseurls = [c.getServiceNamed("webish").getURL()
for c in self.g.clients]
def get_client_config(self, i=0): def get_client_config(self, i=0):
self.g._check_clients() self.g._check_clients()