ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-22 02:16:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Brian Warner 2016-09-09 17:04:55 -07:00
parent e9c1075ac5
commit 09ce7963c6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/allmydata/test/cli/test_create.py
View File

@ -24,7 +24,6 @@ class Config(unittest.TestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_client_unrecognized_options(self): def test_client_unrecognized_options(self):
basedir = self.mktemp()
tests = [ tests = [
("--listen", ("create-client", "--listen=tcp")), ("--listen", ("create-client", "--listen=tcp")),
("--hostname", ("create-client", "--hostname=computer")), ("--hostname", ("create-client", "--hostname=computer")),
@ -73,7 +72,10 @@ class Config(unittest.TestCase):
basedir = self.mktemp() basedir = self.mktemp()
rc, out, err = yield run_cli("create-node", "--hostname=computer", basedir) rc, out, err = yield run_cli("create-node", "--hostname=computer", basedir)
cfg = self.read_config(basedir) cfg = self.read_config(basedir)
self.assertTrue("computer" in cfg.get("node", "tub.location")) port = cfg.get("node", "tub.port")
location = cfg.get("node", "tub.location")
self.assertRegex(port, r'^tcp:\d+$')
self.assertRegex(location, r'^tcp:computer:\d+$')
@defer.inlineCallbacks @defer.inlineCallbacks
def test_node_port_location(self): def test_node_port_location(self):
@ -87,10 +89,11 @@ class Config(unittest.TestCase):
self.assertEqual(cfg.get("node", "tub.port"), "unix:/var/tahoe/socket") self.assertEqual(cfg.get("node", "tub.port"), "unix:/var/tahoe/socket")
@defer.inlineCallbacks @defer.inlineCallbacks
def test_node_listen_tcp(self): def test_node_listen_tcp_no_hostname(self):
basedir = self.mktemp() basedir = self.mktemp()
rc, out, err = yield run_cli("create-node", "--listen=tcp", basedir) d = run_cli("create-node", "--listen=tcp", basedir)
cfg = self.read_config(basedir) e = yield self.assertFailure(d, usage.UsageError)
self.assertIn("--listen=tcp requires --hostname=", str(e))
@defer.inlineCallbacks @defer.inlineCallbacks
def test_node_listen_tor(self): def test_node_listen_tor(self):