ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-23 10:40:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor cleanups to tests.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-10-20 21:43:54 +01:00
parent b5b301707b
commit f7e02c51b3
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/allmydata/test/test_cli_magic_folder.py
View File

@ -34,18 +34,18 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
def do_invite(self, client_num, nickname): def do_invite(self, client_num, nickname):
nickname_arg = unicode_to_argv(nickname) nickname_arg = unicode_to_argv(nickname)
d = self.do_cli("magic-folder", "invite", "magic:", nickname_arg, client_num=client_num) d = self.do_cli("magic-folder", "invite", "magic:", nickname_arg, client_num=client_num)
def _done((rc,stdout,stderr)): def _done((rc, stdout, stderr)):
self.failUnless(rc == 0) self.failUnlessEqual(rc, 0)
return (rc,stdout,stderr) return (rc, stdout, stderr)
d.addCallback(_done) d.addCallback(_done)
return d return d
def do_join(self, client_num, local_dir, invite_code): def do_join(self, client_num, local_dir, invite_code):
magic_readonly_cap, dmd_write_cap = invite_code.split(magic_folder_cli.INVITE_SEPARATOR) magic_readonly_cap, dmd_write_cap = invite_code.split(magic_folder_cli.INVITE_SEPARATOR)
d = self.do_cli("magic-folder", "join", invite_code, local_dir, client_num=client_num) d = self.do_cli("magic-folder", "join", invite_code, local_dir, client_num=client_num)
def _done((rc,stdout,stderr)): def _done((rc, stdout, stderr)):
self.failUnless(rc == 0) self.failUnlessEqual(rc, 0)
return (rc,stdout,stderr) return (rc, stdout, stderr)
d.addCallback(_done) d.addCallback(_done)
return d return d
@ -55,9 +55,9 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
""" """
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), "private/collective_dircap"))
d = self.do_cli("ls", "--json", collective_readonly_cap, client_num=client_num) d = self.do_cli("ls", "--json", collective_readonly_cap, client_num=client_num)
def _done((rc,stdout,stderr)): def _done((rc, stdout, stderr)):
self.failUnless(rc == 0) self.failUnlessEqual(rc, 0)
return (rc,stdout,stderr) return (rc, stdout, stderr)
d.addCallback(_done) d.addCallback(_done)
def test_joined_magic_folder((rc,stdout,stderr)): def test_joined_magic_folder((rc,stdout,stderr)):
readonly_cap = unicode(uri.from_string(upload_dircap).get_readonly().to_string(), 'utf-8') readonly_cap = unicode(uri.from_string(upload_dircap).get_readonly().to_string(), 'utf-8')
@ -85,7 +85,7 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
local_dir_arg = unicode_to_argv(local_dir) local_dir_arg = unicode_to_argv(local_dir)
d = self.do_cli("magic-folder", "create", "magic:", nickname_arg, local_dir_arg) d = self.do_cli("magic-folder", "create", "magic:", nickname_arg, local_dir_arg)
def _done((rc, stdout, stderr)): def _done((rc, stdout, stderr)):
self.failUnless(rc == 0) self.failUnlessEqual(rc, 0)
client = self.get_client() client = self.get_client()
self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0) self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0)
@ -138,10 +138,10 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
# invites herself then and joins. # invites herself then and joins.
d = self.do_create_magic_folder(0) d = self.do_create_magic_folder(0)
d.addCallback(lambda ign: self.do_invite(0, u"Alice\u00F8")) d.addCallback(lambda ign: self.do_invite(0, u"Alice\u00F8"))
def get_invitecode(result): def get_invite_code(result):
self.invitecode = result[1].strip() self.invite_code = result[1].strip()
d.addCallback(get_invitecode) d.addCallback(get_invite_code)
d.addCallback(lambda ign: self.do_join(0, alice_magic_dir, self.invitecode)) d.addCallback(lambda ign: self.do_join(0, alice_magic_dir, self.invite_code))
def get_alice_caps(ign): def get_alice_caps(ign):
self.alice_collective_dircap, self.alice_upload_dircap = self.get_caps_from_files(0) self.alice_collective_dircap, self.alice_upload_dircap = self.get_caps_from_files(0)
d.addCallback(get_alice_caps) d.addCallback(get_alice_caps)
@ -156,10 +156,10 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
# Alice invites Bob. Bob joins. # Alice invites Bob. Bob joins.
d.addCallback(lambda ign: self.do_invite(0, u"Bob\u00F8")) d.addCallback(lambda ign: self.do_invite(0, u"Bob\u00F8"))
def get_invitecode(result): def get_invite_code(result):
self.invitecode = result[1].strip() self.invite_code = result[1].strip()
d.addCallback(get_invitecode) d.addCallback(get_invite_code)
d.addCallback(lambda ign: self.do_join(1, bob_magic_dir, self.invitecode)) d.addCallback(lambda ign: self.do_join(1, bob_magic_dir, self.invite_code))
def get_bob_caps(ign): def get_bob_caps(ign):
self.bob_collective_dircap, self.bob_upload_dircap = self.get_caps_from_files(1) self.bob_collective_dircap, self.bob_upload_dircap = self.get_caps_from_files(1)
d.addCallback(get_bob_caps) d.addCallback(get_bob_caps)
@ -211,11 +211,9 @@ class CreateMagicFolder(MagicFolderCLITestMixin, unittest.TestCase):
d = self.do_cli("magic-folder", "create", "magic:", "Alice", local_dir) d = self.do_cli("magic-folder", "create", "magic:", "Alice", local_dir)
def _done((rc, stdout, stderr)): def _done((rc, stdout, stderr)):
self.failUnless(rc == 0) self.failUnlessEqual(rc, 0)
d.addCallback(_done)
def get_caps(ign):
self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0) self.collective_dircap, self.upload_dircap = self.get_caps_from_files(0)
d.addCallback(get_caps) d.addCallback(_done)
d.addCallback(lambda ign: self.check_joined_config(0, self.upload_dircap)) 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, abspath_expanduser_unicode(unicode(local_dir))))
return d return d