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
local_dir_arg = unicode_to_argv(local_dir)
d = self.do_cli("magic-folder", "join", invite_code, local_dir_arg, client_num=client_num)
+ def _done((rc, stdout, stderr)):
+ self.failUnlessEqual(rc, 0)
+ self.failUnlessEqual(stdout, "")
+ self.failUnlessEqual(stderr, "")
+ return (rc, stdout, stderr)
+ d.addCallback(_done)
+ return d
+
+ def do_leave(self, client_num):
+ d = self.do_cli("magic-folder", "leave", client_num=client_num)
def _done((rc, stdout, stderr)):
self.failUnlessEqual(rc, 0)
return (rc, stdout, stderr)
"""Tests that our collective directory has the readonly cap of
our upload directory.
"""
- collective_readonly_cap = fileutil.read(os.path.join(self.get_clientdir(i=client_num), "private/collective_dircap"))
+ collective_readonly_cap = fileutil.read(os.path.join(self.get_clientdir(i=client_num),
+ u"private", u"collective_dircap"))
d = self.do_cli("ls", "--json", collective_readonly_cap, client_num=client_num)
def _done((rc, stdout, stderr)):
self.failUnlessEqual(rc, 0)
return d
def get_caps_from_files(self, client_num):
- collective_dircap = fileutil.read(os.path.join(self.get_clientdir(i=client_num), "private/collective_dircap"))
- upload_dircap = fileutil.read(os.path.join(self.get_clientdir(i=client_num), "private/magic_folder_dircap"))
+ collective_dircap = fileutil.read(os.path.join(self.get_clientdir(i=client_num),
+ u"private", u"collective_dircap"))
+ upload_dircap = fileutil.read(os.path.join(self.get_clientdir(i=client_num),
+ u"private", u"magic_folder_dircap"))
self.failIf(collective_dircap is None or upload_dircap is None)
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)
return d
def cleanup(self, res):
- #print "cleanup", res
d = defer.succeed(None)
if self.magicfolder is not None:
d.addCallback(lambda ign: self.magicfolder.finish())
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
self.basedir = "cli/MagicFolder/create-and-then-invite-join"
self.set_up_grid()
local_dir = os.path.join(self.basedir, "magic")
+ abs_local_dir_u = abspath_expanduser_unicode(unicode(local_dir), long_path=False)
d = self.do_create_magic_folder(0)
d.addCallback(lambda ign: self.do_invite(0, u"Alice"))
self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0)
d.addCallback(get_caps)
d.addCallback(lambda ign: self.check_joined_config(0, self.upload_dircap))
- d.addCallback(lambda ign: self.check_config(0, abspath_expanduser_unicode(unicode(local_dir))))
+ d.addCallback(lambda ign: self.check_config(0, abs_local_dir_u))
return d
def test_create_error(self):
self.basedir = "cli/MagicFolder/create-invite-join"
self.set_up_grid()
local_dir = os.path.join(self.basedir, "magic")
+ abs_local_dir_u = abspath_expanduser_unicode(unicode(local_dir), long_path=False)
d = self.do_cli("magic-folder", "create", "magic:", "Alice", local_dir)
def _done((rc, stdout, stderr)):
self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0)
d.addCallback(_done)
d.addCallback(lambda ign: self.check_joined_config(0, self.upload_dircap))
- d.addCallback(lambda ign: self.check_config(0, abspath_expanduser_unicode(unicode(local_dir))))
+ d.addCallback(lambda ign: self.check_config(0, abs_local_dir_u))
return d
def test_create_invite_join_failure(self):
self.failUnlessIn("cannot start with '-'", str(e))
else:
self.fail("expected UsageError")
+
+ def test_join_twice_failure(self):
+ self.basedir = "cli/MagicFolder/create-join-twice-failure"
+ os.makedirs(self.basedir)
+ self.set_up_grid()
+ local_dir = os.path.join(self.basedir, "magic")
+ abs_local_dir_u = abspath_expanduser_unicode(unicode(local_dir), long_path=False)
+
+ d = self.do_create_magic_folder(0)
+ d.addCallback(lambda ign: self.do_invite(0, u"Alice"))
+ def get_invite_code_and_join((rc, stdout, stderr)):
+ self.invite_code = stdout.strip()
+ return self.do_join(0, unicode(local_dir), self.invite_code)
+ d.addCallback(get_invite_code_and_join)
+ def get_caps(ign):
+ self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0)
+ d.addCallback(get_caps)
+ d.addCallback(lambda ign: self.check_joined_config(0, self.upload_dircap))
+ d.addCallback(lambda ign: self.check_config(0, abs_local_dir_u))
+ def join_again(ignore):
+ return self.do_cli("magic-folder", "join", self.invite_code, local_dir, client_num=0)
+ d.addCallback(join_again)
+ def get_results(result):
+ code = result[0]
+ stdout = result[1]
+ stderr = result[2]
+ self.failUnlessEqual(stdout, "")
+ self.failUnlessEqual(stderr, "\nThis client has already joined a magic folder."
+ "\nUse the 'tahoe magic-folder leave' command first.\n\n")
+ self.failIfEqual(code, 0)
+ d.addCallback(get_results)
+ return d
+
+ def test_join_leave_join(self):
+ self.basedir = "cli/MagicFolder/create-join-leave-join"
+ os.makedirs(self.basedir)
+ self.set_up_grid()
+ local_dir = os.path.join(self.basedir, "magic")
+ abs_local_dir_u = abspath_expanduser_unicode(unicode(local_dir), long_path=False)
+
+ self.invite_code = None
+ d = self.do_create_magic_folder(0)
+ d.addCallback(lambda ign: self.do_invite(0, u"Alice"))
+ def get_invite_code_and_join((rc, stdout, stderr)):
+ self.invite_code = stdout.strip()
+ return self.do_join(0, unicode(local_dir), self.invite_code)
+ d.addCallback(get_invite_code_and_join)
+ def get_caps(ign):
+ self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0)
+ d.addCallback(get_caps)
+ d.addCallback(lambda ign: self.check_joined_config(0, self.upload_dircap))
+ d.addCallback(lambda ign: self.check_config(0, abs_local_dir_u))
+ d.addCallback(lambda ign: self.do_leave(0))
+
+ def check_join_again(invite_code):
+ d2 = defer.succeed(None)
+ def join_again(ignore):
+ return self.do_join(0, unicode(local_dir), self.invite_code)
+ d2.addCallback(join_again)
+ return d2
+
+ d.addCallback(lambda ign, invite_code: check_join_again(invite_code), self.invite_code)
+ def get_caps(ign):
+ self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0)
+ d.addCallback(get_caps)
+ d.addCallback(lambda ign: self.check_joined_config(0, self.upload_dircap))
+ d.addCallback(lambda ign: self.check_config(0, abs_local_dir_u))
+
+ return d
+
+ def test_join_failures(self):
+ self.basedir = "cli/MagicFolder/create-join-failures"
+ os.makedirs(self.basedir)
+ self.set_up_grid()
+ local_dir = os.path.join(self.basedir, "magic")
+ abs_local_dir_u = abspath_expanduser_unicode(unicode(local_dir), long_path=False)
+
+ self.invite_code = None
+ d = self.do_create_magic_folder(0)
+ d.addCallback(lambda ign: self.do_invite(0, u"Alice"))
+ def get_invite_code_and_join((rc, stdout, stderr)):
+ self.invite_code = stdout.strip()
+ return self.do_join(0, unicode(local_dir), self.invite_code)
+ d.addCallback(get_invite_code_and_join)
+ def get_caps(ign):
+ self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0)
+ d.addCallback(get_caps)
+ d.addCallback(lambda ign: self.check_joined_config(0, self.upload_dircap))
+ d.addCallback(lambda ign: self.check_config(0, abs_local_dir_u))
+
+ def leave(ignore):
+ return self.do_cli("magic-folder", "leave", client_num=0)
+ d.addCallback(leave)
+
+ collective_dircap_file = os.path.join(self.get_clientdir(i=0), u"private", u"collective_dircap")
+ upload_dircap = os.path.join(self.get_clientdir(i=0), u"private", u"magic_folder_dircap")
+ magic_folder_db_file = os.path.join(self.get_clientdir(i=0), u"private", u"magicfolderdb.sqlite")
+
+ def check_join_if_file(my_file):
+ fileutil.write(my_file, "my file data")
+ d2 = defer.succeed(None)
+ def join_again(ignore):
+ return self.do_cli("magic-folder", "join", self.invite_code, local_dir, client_num=0)
+ d2.addCallback(join_again)
+ def get_results(result):
+ code = result[0]
+ self.failIfEqual(code, 0)
+ d2.addCallback(get_results)
+ return d2
+
+ for my_file in [collective_dircap_file, upload_dircap, magic_folder_db_file]:
+ d.addCallback(lambda ign, my_file: check_join_if_file(my_file), my_file)
+ d.addCallback(leave)
+
+ return d
projects / tahoe-lafs / tahoe-lafs.git / blobdiff