mutable WIP: merge in patches from current trunk

This commit is contained in:
Brian Warner 2008-04-17 13:09:22 -07:00
parent ee218c262d
commit 157073d8d8
2 changed files with 21 additions and 2489 deletions

File diff suppressed because it is too large Load Diff

View File

@ -346,25 +346,27 @@ class MakeShares(unittest.TestCase):
c = FakeClient() c = FakeClient()
fn = FastMutableFileNode(c) fn = FastMutableFileNode(c)
CONTENTS = "some initial contents" CONTENTS = "some initial contents"
fn.create(CONTENTS) d = fn.create(CONTENTS)
p = mutable.Publish(fn) def _created(res):
r = mutable.Retrieve(fn) p = Publish(fn, None)
# make some fake shares self._p = p
shares_and_ids = ( ["%07d" % i for i in range(10)], range(10) ) p.newdata = CONTENTS
target_info = None p.required_shares = 3
p._privkey = FakePrivKey(0) p.total_shares = 10
p._encprivkey = "encprivkey" p.setup_encoding_parameters()
p._pubkey = FakePubKey(0) p._new_seqnum = 3
d = defer.maybeDeferred(p._generate_shares, p.salt = "SALT" * 4
(shares_and_ids, # make some fake shares
3, 10, shares_and_ids = ( ["%07d" % i for i in range(10)], range(10) )
21, # segsize p._privkey = fn.get_privkey()
len(CONTENTS), p._encprivkey = fn.get_encprivkey()
target_info), p._pubkey = fn.get_pubkey()
3, # seqnum return p._generate_shares(shares_and_ids)
"IV"*8) d.addCallback(_created)
def _done( (seqnum, root_hash, final_shares, target_info2) ): def _generated(res):
self.failUnlessEqual(seqnum, 3) p = self._p
final_shares = p.shares
root_hash = p.root_hash
self.failUnlessEqual(len(root_hash), 32) self.failUnlessEqual(len(root_hash), 32)
self.failUnless(isinstance(final_shares, dict)) self.failUnless(isinstance(final_shares, dict))
self.failUnlessEqual(len(final_shares), 10) self.failUnlessEqual(len(final_shares), 10)