From: David Stainton Date: Tue, 20 Oct 2015 12:27:05 +0000 (+0200) Subject: Fix magic-folder cli tests X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri?a=commitdiff_plain;h=aa4a3c2da44cd0b537626a47f621678d4e59749b;p=tahoe-lafs%2Ftahoe-lafs.git Fix magic-folder cli tests convert path to abs path when matching strings in the generated config file. --- diff --git a/src/allmydata/test/test_cli_magic_folder.py b/src/allmydata/test/test_cli_magic_folder.py index d424d752..3dc6cbe6 100644 --- a/src/allmydata/test/test_cli_magic_folder.py +++ b/src/allmydata/test/test_cli_magic_folder.py @@ -74,8 +74,7 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin): def check_config(self, client_num, local_dir): client_config = fileutil.read(os.path.join(self.get_clientdir(i=client_num), "tahoe.cfg")) - # XXX utf-8? - local_dir = local_dir.encode('utf-8') + local_dir = argv_to_abspath(str(local_dir)) ret = re.search("\[magic_folder\]\nenabled = True\nlocal.directory = %s" % (local_dir,), client_config) self.failIf(ret is None)