tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

improve test_client_cache

This commit is contained in:
Brian Warner 2016-05-11 13:30:39 -07:00
parent ecec58b339
commit cfb939aa99
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/allmydata/test/test_introducer.py
View File

@ -1015,7 +1015,7 @@ class Announcements(unittest.TestCase):
yaml.SafeLoader.add_constructor("tag:yaml.org,2002:python/unicode", constructor) yaml.SafeLoader.add_constructor("tag:yaml.org,2002:python/unicode", constructor)
return yaml.safe_load(f) return yaml.safe_load(f)
def test_client_cache_1(self): def test_client_cache(self):
basedir = "introducer/ClientSeqnums/test_client_cache_1" basedir = "introducer/ClientSeqnums/test_client_cache_1"
fileutil.make_dirs(basedir) fileutil.make_dirs(basedir)
cache_filepath = FilePath(os.path.join(basedir, "private", cache_filepath = FilePath(os.path.join(basedir, "private",
@ -1036,7 +1036,7 @@ class Announcements(unittest.TestCase):
ic = c.introducer_client ic = c.introducer_client
sk_s, vk_s = keyutil.make_keypair() sk_s, vk_s = keyutil.make_keypair()
sk, _ignored = keyutil.parse_privkey(sk_s) sk, _ignored = keyutil.parse_privkey(sk_s)
keyutil.remove_prefix(vk_s, "pub-v0-") pub1 = keyutil.remove_prefix(vk_s, "pub-")
furl1 = "pb://onug64tu@127.0.0.1:123/short" # base32("short") furl1 = "pb://onug64tu@127.0.0.1:123/short" # base32("short")
ann_t = make_ann_t(ic, furl1, sk, 1) ann_t = make_ann_t(ic, furl1, sk, 1)
@ -1045,7 +1045,39 @@ class Announcements(unittest.TestCase):
# check the cache for the announcement # check the cache for the announcement
announcements = self._load_cache(cache_filepath) announcements = self._load_cache(cache_filepath)
self.failUnlessEqual(len(announcements), 1) self.failUnlessEqual(len(announcements), 1)
self.failUnlessEqual("pub-" + announcements[0]['key_s'], vk_s) self.failUnlessEqual(announcements[0]['key_s'], pub1)
ann = announcements[0]["ann"]
self.failUnlessEqual(ann["anonymous-storage-FURL"], furl1)
self.failUnlessEqual(ann["seqnum"], 1)
# a new announcement that replaces the first should replace the
# cached entry, not duplicate it
furl2 = furl1 + "er"
ann_t2 = make_ann_t(ic, furl2, sk, 2)
ic.got_announcements([ann_t2])
announcements = self._load_cache(cache_filepath)
self.failUnlessEqual(len(announcements), 1)
self.failUnlessEqual(announcements[0]['key_s'], pub1)
ann = announcements[0]["ann"]
self.failUnlessEqual(ann["anonymous-storage-FURL"], furl2)
self.failUnlessEqual(ann["seqnum"], 2)
# but a third announcement with a different key should add to the
# cache
sk_s2, vk_s2 = keyutil.make_keypair()
sk2, _ignored = keyutil.parse_privkey(sk_s2)
pub2 = keyutil.remove_prefix(vk_s2, "pub-")
furl3 = "pb://onug64tu@127.0.0.1:456/short"
ann_t3 = make_ann_t(ic, furl3, sk2, 1)
ic.got_announcements([ann_t3])
announcements = self._load_cache(cache_filepath)
self.failUnlessEqual(len(announcements), 2)
self.failUnlessEqual(set([pub1, pub2]),
set([a["key_s"] for a in announcements]))
self.failUnlessEqual(set([furl2, furl3]),
set([a["ann"]["anonymous-storage-FURL"]
for a in announcements]))
class ClientSeqnums(unittest.TestCase): class ClientSeqnums(unittest.TestCase):