Changeset 83773364 in trunk

Timestamp:

2009-06-24T19:40:38Z (16 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

bd6ecc9f

Parents:

96cda87

Message:

remove introducer/old.py, will create something similar when the RIIntroducer changes

Location:

src/allmydata

Files:

• introducer/old.py (deleted)
• test/test_introducer.py (modified) (4 diffs)

src/allmydata/test/test_introducer.py ¶

@@ +1 @@
+
+import os, re
 from base64 import b32decode
-
-import os
 
 from twisted.trial import unittest
@@ -14 +14 @@
 # test compatibility with old introducer .tac files
 from allmydata.introducer import IntroducerNode
-from allmydata.introducer import old
 from allmydata.util import pollmixin
 import common_util as testutil
@@ -207 +206 @@
             log.msg("restarting introducer's Tub")
 
-            # note: old.Server doesn't have this count
             dc = introducer._debug_counts
             self.expected_count = dc["inbound_message"] + NUM_SERVERS
@@ -380 +378 @@
         return d
 
-class Index(unittest.TestCase):
-    def test_make_index(self):
+class DecodeFurl(unittest.TestCase):
+    def test_decode(self):
         # make sure we have a working base64.b32decode. The one in
         # python2.4.[01] was broken.
-        ann = ('pb://t5g7egomnnktbpydbuijt6zgtmw4oqi5@127.0.0.1:51857/hfzv36i',
-               'storage', 'RIStorageServer.tahoe.allmydata.com',
-               'plancha', 'allmydata-tahoe/1.4.1', '1.0.0')
-        (nodeid, service_name) = old.make_index(ann)
+        furl = 'pb://t5g7egomnnktbpydbuijt6zgtmw4oqi5@127.0.0.1:51857/hfzv36i'
+        m = re.match(r'pb://(\w+)@', furl)
+        assert m
+        nodeid = b32decode(m.group(1).upper())
         self.failUnlessEqual(nodeid, "\x9fM\xf2\x19\xcckU0\xbf\x03\r\x10\x99\xfb&\x9b-\xc7A\x1d")
-        self.failUnlessEqual(service_name, "storage")
-
+