From: Daira Hopwood Date: Tue, 24 Feb 2015 17:43:21 +0000 (+0000) Subject: More WIP X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/module-simplejson.scanner.html?a=commitdiff_plain;h=5278cf925d6c4164089313f0f293e1fcec2145cb;p=tahoe-lafs%2Ftahoe-lafs.git More WIP --- diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py index 1e1e99b7..68c6f12f 100644 --- a/src/allmydata/test/test_cli.py +++ b/src/allmydata/test/test_cli.py @@ -36,7 +36,7 @@ from twisted.internet import threads # CLI tests use deferToThread from twisted.python import usage from allmydata.util.encodingutil import listdir_unicode, unicode_platform, \ - get_io_encoding, get_filesystem_encoding + get_io_encoding, get_filesystem_encoding, unicode_to_argv timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s