From 10ebbeebaa783d559534a294983fa85092ddd1e5 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Mon, 9 Feb 2015 19:45:31 +0000 Subject: [PATCH] test_node.py: refactor test_location* to reduce code duplication. refs #754 Signed-off-by: Daira Hopwood --- src/allmydata/test/test_node.py | 36 ++++++++++++++------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/allmydata/test/test_node.py b/src/allmydata/test/test_node.py index 88303f2a..cf7d0f57 100644 --- a/src/allmydata/test/test_node.py +++ b/src/allmydata/test/test_node.py @@ -33,12 +33,14 @@ class TestCase(testutil.SignalMixin, unittest.TestCase): d.addCallback(flushEventualQueue) return d - def test_location(self): - basedir = "test_node/test_location" + def _test_location(self, basedir, expected_addresses, tub_port=None, tub_location=None): fileutil.make_dirs(basedir) f = open(os.path.join(basedir, 'tahoe.cfg'), 'wt') f.write("[node]\n") - f.write("tub.location = 1.2.3.4:5\n") + if tub_port: + f.write("tub.port = %d\n" % (tub_port,)) + if tub_location is not None: + f.write("tub.location = %s\n" % (tub_location,)) f.close() n = TestNode(basedir) @@ -47,30 +49,22 @@ class TestCase(testutil.SignalMixin, unittest.TestCase): def _check_addresses(ignored_result): furl = n.tub.registerReference(n) - self.failUnless("1.2.3.4:5" in furl, furl) + for address in expected_addresses: + self.failUnlessIn(address, furl) d.addCallback(_check_addresses) return d - def test_location2(self): - basedir = "test_node/test_location2" - fileutil.make_dirs(basedir) - f = open(os.path.join(basedir, 'tahoe.cfg'), 'wt') - f.write("[node]\n") - f.write("tub.location = 1.2.3.4:5,example.org:8091\n") - f.close() - - n = TestNode(basedir) - n.setServiceParent(self.parent) - d = n.when_tub_ready() + def test_location1(self): + return self._test_location(basedir="test_node/test_location1", + expected_addresses=["192.0.2.0:1234"], + tub_location="192.0.2.0:1234") - def _check_addresses(ignored_result): - furl = n.tub.registerReference(n) - self.failUnless("1.2.3.4:5" in furl, furl) - self.failUnless("example.org:8091" in furl, furl) + def test_location2(self): + return self._test_location(basedir="test_node/test_location2", + expected_addresses=["192.0.2.0:1234", "example.org:8091"], + tub_location="192.0.2.0:1234,example.org:8091") - d.addCallback(_check_addresses) - return d def test_tahoe_cfg_utf8(self): basedir = "test_node/test_tahoe_cfg_utf8" -- 2.45.2