Fix tests usage of umask

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / test / test_cli_magic_folder.py

diff --git a/src/allmydata/test/test_cli_magic_folder.py b/src/allmydata/test/test_cli_magic_folder.py
index 07e6ed7f5a24762c12f0e5f482ffabc02932646f..c69ee1e0050014a2e363b63bb97f9b6361c48b8b 100644 (file)
--- a/src/allmydata/test/test_cli_magic_folder.py
+++ b/src/allmydata/test/test_cli_magic_folder.py
@@ -8,7 +8,6 @@ from twisted.python import usage
 
 from allmydata.util.assertutil import precondition
 from allmydata.util import fileutil
-from allmydata.util.fileutil import precondition_abspath
 from allmydata.scripts.common import get_aliases
 from allmydata.test.no_network import GridTestMixin
 from .test_cli import CLITestMixin
@@ -81,11 +80,10 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
         return collective_dircap, upload_dircap
 
     def check_config(self, client_num, local_dir):
-        precondition_abspath(local_dir)
         client_config = fileutil.read(os.path.join(self.get_clientdir(i=client_num), "tahoe.cfg"))
         local_dir_utf8 = local_dir.encode('utf-8')
-        ret = re.search("\[magic_folder\]\nenabled = True\nlocal.directory = %s" % (local_dir_utf8,), client_config)
-        self.failIf(ret is None)
+        magic_folder_config = "[magic_folder]\nenabled = True\nlocal.directory = %s" % (local_dir_utf8,)
+        self.failUnlessIn(magic_folder_config, client_config)
 
     def create_invite_join_magic_folder(self, nickname, local_dir):
         nickname_arg = unicode_to_argv(nickname)
@@ -114,18 +112,9 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
     def init_magicfolder(self, client_num, upload_dircap, collective_dircap, local_magic_dir, clock):
         dbfile = abspath_expanduser_unicode(u"magicfolderdb.sqlite", base=self.get_clientdir(i=client_num))
         magicfolder = MagicFolder(self.get_client(client_num), upload_dircap, collective_dircap, local_magic_dir,
-                                       dbfile, pending_delay=0.2, clock=clock)
+                                       dbfile, 0077, pending_delay=0.2, clock=clock)
         magicfolder.downloader._turn_delay = 0
 
-        orig = magicfolder.uploader._append_to_deque
-        # the _append_to_deque method queues a _turn_deque, so we
-        # immediately trigger it by wrapping _append_to_deque
-        def wrap(*args, **kw):
-            x = orig(*args, **kw)
-            clock.advance(0)  # _turn_delay is always 0 for the tests
-            return x
-        magicfolder.uploader._append_to_deque = wrap
-
         magicfolder.setServiceParent(self.get_client(client_num))
         magicfolder.ready()
         return magicfolder