diff --git a/src/allmydata/test/test_introducer.py b/src/allmydata/test/test_introducer.py index 60a3026b3..22f5e9e30 100644 --- a/src/allmydata/test/test_introducer.py +++ b/src/allmydata/test/test_introducer.py @@ -92,7 +92,8 @@ class Introducer(ServiceMixin, unittest.TestCase, pollmixin.PollMixin): def test_create(self): ic = IntroducerClient(None, "introducer.furl", u"my_nickname", - "my_version", "oldest_version", {}, fakeseq, FilePath("notexist.introduced.yaml")) + "my_version", "oldest_version", {}, fakeseq, + FilePath(self.mktemp())) self.failUnless(isinstance(ic, IntroducerClient)) def test_listen(self): @@ -125,7 +126,7 @@ class Introducer(ServiceMixin, unittest.TestCase, pollmixin.PollMixin): ic = IntroducerClient(None, "introducer.furl", u"my_nickname", "my_version", "oldest_version", {}, fakeseq, - FilePath("notexist.introduced.yaml")) + FilePath(self.mktemp())) sk_s, vk_s = keyutil.make_keypair() sk, _ignored = keyutil.parse_privkey(sk_s) keyid = keyutil.remove_prefix(vk_s, "pub-v0-") @@ -175,7 +176,7 @@ class Client(unittest.TestCase): ic = IntroducerClient(None, "introducer.furl", u"my_nickname", "my_version", "oldest_version", {}, fakeseq, - FilePath("notexist.introduced.yaml")) + FilePath(self.mktemp())) announcements = [] ic.subscribe_to("storage", lambda key_s,ann: announcements.append(ann)) @@ -225,13 +226,13 @@ class Client(unittest.TestCase): ic1 = IntroducerClient(None, "introducer.furl", u"my_nickname", "ver23", "oldest_version", {}, fakeseq, - FilePath("notexist.introduced.yaml")) + FilePath(self.mktemp())) # we use a second client just to create a different-looking # announcement ic2 = IntroducerClient(None, "introducer.furl", u"my_nickname", "ver24","oldest_version",{}, fakeseq, - FilePath("notexist.introduced.yaml")) + FilePath(self.mktemp())) announcements = [] def _received(key_s, ann): announcements.append( (key_s, ann) ) @@ -335,7 +336,7 @@ class Client(unittest.TestCase): ic = IntroducerClient(None, "introducer.furl", u"my_nickname", "my_version", "oldest_version", {}, fakeseq, - FilePath("notexist.introduced.yaml")) + FilePath(self.mktemp())) announcements = [] ic.subscribe_to("storage", lambda key_s,ann: announcements.append(ann)) @@ -374,7 +375,7 @@ class Server(unittest.TestCase): ic1 = IntroducerClient(None, "introducer.furl", u"my_nickname", "ver23", "oldest_version", {}, realseq, - FilePath("notexist.introduced.yaml")) + FilePath(self.mktemp())) furl1 = "pb://62ubehyunnyhzs7r6vdonnm2hpi52w6y@127.0.0.1:36106/gydnp" privkey_s, _ = keyutil.make_keypair() @@ -477,7 +478,7 @@ class Queue(SystemTestMixin, unittest.TestCase): tub2.setServiceParent(self.parent) c = IntroducerClient(tub2, ifurl, u"nickname", "version", "oldest", {}, fakeseq, - FilePath("notexist.introduced.yaml")) + FilePath(self.mktemp())) furl1 = "pb://onug64tu@127.0.0.1:123/short" # base32("short") sk_s, vk_s = keyutil.make_keypair() sk, _ignored = keyutil.parse_privkey(sk_s) @@ -566,7 +567,7 @@ class SystemTest(SystemTestMixin, unittest.TestCase): NICKNAME % str(i), "version", "oldest", {"component": "component-v1"}, fakeseq, - FilePath("notexist.introduced.yaml")) + FilePath(self.mktemp())) received_announcements[c] = {} def got(key_s_or_tubid, ann, announcements, i): if i == 0: @@ -886,7 +887,7 @@ class ClientInfo(unittest.TestCase): app_versions = {"whizzy": "fizzy"} client_v2 = IntroducerClient(tub, introducer_furl, NICKNAME % u"v2", "my_version", "oldest", app_versions, - fakeseq, FilePath("notexist.introduced.yaml")) + fakeseq, FilePath(self.mktemp())) #furl1 = "pb://62ubehyunnyhzs7r6vdonnm2hpi52w6y@127.0.0.1:0/swissnum" #ann_s = make_ann_t(client_v2, furl1, None, 10) #introducer.remote_publish_v2(ann_s, Referenceable()) @@ -948,7 +949,7 @@ class Announcements(unittest.TestCase): app_versions = {"whizzy": "fizzy"} client_v2 = IntroducerClient(tub, introducer_furl, u"nick-v2", "my_version", "oldest", app_versions, - fakeseq, FilePath("notexist.introduced.yaml")) + fakeseq, FilePath(self.mktemp())) furl1 = "pb://62ubehyunnyhzs7r6vdonnm2hpi52w6y@127.0.0.1:0/swissnum" tubid = "62ubehyunnyhzs7r6vdonnm2hpi52w6y" ann_s0 = make_ann_t(client_v2, furl1, None, 10) @@ -970,7 +971,7 @@ class Announcements(unittest.TestCase): app_versions = {"whizzy": "fizzy"} client_v2 = IntroducerClient(tub, introducer_furl, u"nick-v2", "my_version", "oldest", app_versions, - fakeseq, FilePath("notexist.introduced.yaml")) + fakeseq, FilePath(self.mktemp())) furl1 = "pb://62ubehyunnyhzs7r6vdonnm2hpi52w6y@127.0.0.1:0/swissnum" sk_s, vk_s = keyutil.make_keypair() sk, _ignored = keyutil.parse_privkey(sk_s) @@ -1010,7 +1011,8 @@ class Announcements(unittest.TestCase): def test_client_cache_1(self): basedir = "introducer/ClientSeqnums/test_client_cache_1" fileutil.make_dirs(basedir) - cache_filepath = FilePath(os.path.join(basedir, "private", "introducer_cache.yaml")) + cache_filepath = FilePath(os.path.join(basedir, "private", + "introducer_cache.yaml")) # if storage is enabled, the Client will publish its storage server # during startup (although the announcement will wait in a queue @@ -1027,7 +1029,7 @@ class Announcements(unittest.TestCase): ic = c.introducer_client sk_s, vk_s = keyutil.make_keypair() sk, _ignored = keyutil.parse_privkey(sk_s) - keyid = keyutil.remove_prefix(vk_s, "pub-v0-") + keyutil.remove_prefix(vk_s, "pub-v0-") furl1 = "pb://onug64tu@127.0.0.1:123/short" # base32("short") ann_t = make_ann_t(ic, furl1, sk, 1) @@ -1044,40 +1046,6 @@ class Announcements(unittest.TestCase): self.failUnlessEqual(len(announcements), 1) self.failUnlessEqual("pub-" + announcements[0]['key_s'], vk_s) - def test_client_cache_2(self): - basedir = "introducer/ClientSeqnums/test_client_cache_2" - fileutil.make_dirs(basedir) - cache_filepath = FilePath(os.path.join(basedir, "private", "introducer_cache.yaml")) - - # if storage is enabled, the Client will publish its storage server - # during startup (although the announcement will wait in a queue - # until the introducer connection is established). To avoid getting - # confused by this, disable storage. - f = open(os.path.join(basedir, "tahoe.cfg"), "w") - f.write("[client]\n") - f.write("introducer.furl = nope\n") - f.write("[storage]\n") - f.write("enabled = false\n") - f.close() - - c = TahoeClient(basedir) - ic = c.introducer_client - furl1 = "pb://62ubehyunnyhzs7r6vdonnm2hpi52w6y@192.168.69.247:36106,127.0.0.1:36106/gydnpigj2ja2qr2srq4ikjwnl7xfgbra" - ann1 = (furl1, "storage", "RIStorage", "nick1", "ver23", "ver0") - ann = make_ann_t(ic, furl1, '', 2) - ic.got_announcements([ann]) - - # check the cache for the announcement - with cache_filepath.open() as f: - def constructor(loader, node): - return node.value - yaml.SafeLoader.add_constructor("tag:yaml.org,2002:python/unicode", constructor) - announcements = yaml.safe_load(f) - f.close() - - self.failUnlessEqual(len(announcements), 1) - self.failUnlessEqual(announcements[0]['key_s'], None) - class ClientSeqnums(unittest.TestCase): def test_client(self): @@ -1160,7 +1128,7 @@ class NonV1Server(SystemTestMixin, unittest.TestCase): c = IntroducerClient(tub, self.introducer_furl, u"nickname-client", "version", "oldest", {}, - fakeseq, FilePath("notexist.introduced.yaml")) + fakeseq, FilePath(self.mktemp())) announcements = {} def got(key_s, ann): announcements[key_s] = ann