ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-08 03:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More thorough checks to the join leave join test

Browse Source
This commit is contained in:
David Stainton 2015-12-09 12:45:33 +02:00 committed by Brian Warner
parent 966c556562
commit 74ad656e39
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,16 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
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)
@ -289,20 +299,13 @@ class CreateMagicFolder(MagicFolderCLITestMixin, unittest.TestCase):
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)
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)
def get_results(result):
code = result[0]
self.failUnlessEqual(code, 0)
d2.addCallback(get_results)
return d2
d.addCallback(lambda ign, invite_code: check_join_again(invite_code), self.invite_code)