From e82e2c31e23fd6c6804cb73e0685032e71e30a35 Mon Sep 17 00:00:00 2001 From: str4d Date: Mon, 19 Sep 2016 17:25:45 +1200 Subject: [PATCH 1/2] Update error message to match implementation and docs Closes ticket:2824 --- src/allmydata/node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/allmydata/node.py b/src/allmydata/node.py index 6454cc6d9..56af64164 100644 --- a/src/allmydata/node.py +++ b/src/allmydata/node.py @@ -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 = { From b9b731e3e2e5dfffdbf30fa8222d2025c84cd6d2 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Tue, 20 Sep 2016 10:14:35 -0700 Subject: [PATCH 2/2] update test to match new output --- src/allmydata/test/test_connections.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/allmydata/test/test_connections.py b/src/allmydata/test/test_connections.py index e1b6689b3..ee89bdb72 100644 --- a/src/allmydata/test/test_connections.py +++ b/src/allmydata/test/test_connections.py @@ -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+