From f7f67725774c3a82cf756cd46d3d68029d26018a Mon Sep 17 00:00:00 2001 From: David Stainton Date: Tue, 20 Oct 2015 14:27:05 +0200 Subject: [PATCH] Fix magic-folder cli tests convert path to abs path when matching strings in the generated config file. --- src/allmydata/test/test_cli_magic_folder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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) -- 2.45.2