ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-25 15:41:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

All tests pass on Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-03-18 11:49:27 -04:00
parent 045b6085ff
commit 334093e28c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/test/test_tor_provider.py
View File

@ -173,7 +173,7 @@ class CreateOnion(unittest.TestCase):
protocol))) protocol)))
txtorcon = mock.Mock() txtorcon = mock.Mock()
ehs = mock.Mock() ehs = mock.Mock()
ehs.private_key = "privkey" ehs.private_key = b"privkey"
ehs.hostname = "ONION.onion" ehs.hostname = "ONION.onion"
txtorcon.EphemeralHiddenService = mock.Mock(return_value=ehs) txtorcon.EphemeralHiddenService = mock.Mock(return_value=ehs)
ehs.add_to_tor = mock.Mock(return_value=defer.succeed(None)) ehs.add_to_tor = mock.Mock(return_value=defer.succeed(None))
@ -208,7 +208,7 @@ class CreateOnion(unittest.TestCase):
fn = os.path.join(basedir, tahoe_config_tor["onion.private_key_file"]) fn = os.path.join(basedir, tahoe_config_tor["onion.private_key_file"])
with open(fn, "rb") as f: with open(fn, "rb") as f:
privkey = f.read() privkey = f.read()
self.assertEqual(privkey, "privkey") self.assertEqual(privkey, b"privkey")
def test_launch(self): def test_launch(self):
return self._do_test_launch(None) return self._do_test_launch(None)
@ -227,7 +227,7 @@ class CreateOnion(unittest.TestCase):
protocol))) protocol)))
txtorcon = mock.Mock() txtorcon = mock.Mock()
ehs = mock.Mock() ehs = mock.Mock()
ehs.private_key = "privkey" ehs.private_key = b"privkey"
ehs.hostname = "ONION.onion" ehs.hostname = "ONION.onion"
txtorcon.EphemeralHiddenService = mock.Mock(return_value=ehs) txtorcon.EphemeralHiddenService = mock.Mock(return_value=ehs)
ehs.add_to_tor = mock.Mock(return_value=defer.succeed(None)) ehs.add_to_tor = mock.Mock(return_value=defer.succeed(None))
@ -259,7 +259,7 @@ class CreateOnion(unittest.TestCase):
fn = os.path.join(basedir, tahoe_config_tor["onion.private_key_file"]) fn = os.path.join(basedir, tahoe_config_tor["onion.private_key_file"])
with open(fn, "rb") as f: with open(fn, "rb") as f:
privkey = f.read() privkey = f.read()
self.assertEqual(privkey, "privkey") self.assertEqual(privkey, b"privkey")
_None = object() _None = object()
@ -590,7 +590,7 @@ class Provider_Service(unittest.TestCase):
launch_tor.assert_called_with(reactor, None, launch_tor.assert_called_with(reactor, None,
os.path.join(basedir, "private"), txtorcon) os.path.join(basedir, "private"), txtorcon)
txtorcon.EphemeralHiddenService.assert_called_with("456 127.0.0.1:123", txtorcon.EphemeralHiddenService.assert_called_with("456 127.0.0.1:123",
"private key") b"private key")
ehs.add_to_tor.assert_called_with(tor_state.protocol) ehs.add_to_tor.assert_called_with(tor_state.protocol)
yield p.stopService() yield p.stopService()
@ -632,7 +632,7 @@ class Provider_Service(unittest.TestCase):
cfs.assert_called_with(reactor, "ep_desc") cfs.assert_called_with(reactor, "ep_desc")
txtorcon.build_tor_connection.assert_called_with(tcep) txtorcon.build_tor_connection.assert_called_with(tcep)
txtorcon.EphemeralHiddenService.assert_called_with("456 127.0.0.1:123", txtorcon.EphemeralHiddenService.assert_called_with("456 127.0.0.1:123",
"private key") b"private key")
ehs.add_to_tor.assert_called_with(tor_state.protocol) ehs.add_to_tor.assert_called_with(tor_state.protocol)
yield p.stopService() yield p.stopService()