projects
/
tahoe-lafs
/
tahoe-lafs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
99575a1
)
Fix magic-folder cli tests
author
David Stainton
<dstainton415@gmail.com>
Tue, 20 Oct 2015 12:27:05 +0000
(14:27 +0200)
committer
meejah
<meejah@meejah.ca>
Wed, 20 Jan 2016 08:30:15 +0000
(
01:30
-0700)
convert path to abs path when matching
strings in the generated config file.
src/allmydata/test/test_cli_magic_folder.py
patch
|
blob
|
history
diff --git
a/src/allmydata/test/test_cli_magic_folder.py
b/src/allmydata/test/test_cli_magic_folder.py
index d424d752b837574c86cb664853b03873589c1b0f..3dc6cbe65126b1373b67e589c800175d04f62f79 100644
(file)
--- 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)