get rid of get_clientdir

This commit is contained in:
meejah 2018-02-27 15:01:02 -07:00
parent d544284f92
commit 107ddcd1ba
2 changed files with 3 additions and 4 deletions

View File

@ -397,8 +397,8 @@ class GridTestMixin:
self.client_baseurls = [c.getServiceNamed("webish").getURL()
for c in self.g.clients]
def get_clientdir(self, i=0):
return self.g.clients[i].config._basedir
def get_client_config(self, i=0):
return self.g.clients[i].config
def get_client(self, i=0):
return self.g.clients[i]

View File

@ -13,10 +13,9 @@ class ConfigUtilTests(GridTestMixin, unittest.TestCase):
def test_config_utils(self):
self.basedir = "cli/ConfigUtilTests/test-config-utils"
self.set_up_grid(oneshare=True)
tahoe_cfg = os.path.join(self.get_clientdir(i=0), "tahoe.cfg")
# test that at least one option was read correctly
config = configutil.get_config(tahoe_cfg)
config = self.get_client_config(i=0)
self.failUnlessEqual(config.get("node", "nickname"), "client-0")
# test that set_config can mutate an existing option