ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-09 03:44:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge PR351 from str4d:2824-update-error-message

Browse Source
This commit is contained in:
Brian Warner 2016-09-20 10:15:29 -07:00
commit b537f470c9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/node.py
View File

@ -312,7 +312,7 @@ class Node(service.MultiService):
if not self._reveal_ip:
if self._default_connection_handlers.get("tcp") == "tcp":
raise PrivacyError("tcp = tcp, must be set to 'tor'")
raise PrivacyError("tcp = tcp, must be set to 'tor' or 'disabled'")
def set_tub_options(self):
self.tub_options = {

3
src/allmydata/test/test_connections.py
View File

@ -275,7 +275,8 @@ class Privacy(unittest.TestCase):
n = FakeNode(BASECONFIG+"[node]\nreveal-IP-address = false\n")
n.check_privacy()
e = self.assertRaises(PrivacyError, n.init_connections)
self.assertEqual(str(e), "tcp = tcp, must be set to 'tor'")
self.assertEqual(str(e),
"tcp = tcp, must be set to 'tor' or 'disabled'")
def test_connections_tcp_disabled(self):
n = FakeNode(BASECONFIG+