Clean up the imports again.

[quix0rs-apt-p2p.git] / test_khashmir.py

diff --git a/test_khashmir.py b/test_khashmir.py
index 83ddde3ef5cfbce0056c512c0b6ec180457b9378..24a8760df054012fbf98dafb20d62ccaeafa5221 100644 (file)
--- a/test_khashmir.py
+++ b/test_khashmir.py
@@ -1,11 +1,12 @@
-from unittest import *
-from khashmir import *
-import khash
-from copy import copy
+from unittest import defaultTestLoader, TextTestRunner, TestCase
+from sha import sha
+from random import randrange
+import os, sys
 
-from whrandom import randrange
+from twisted.internet import reactor
 
-import os
+from khashmir import Khashmir
+from khash import newID
 
 if __name__ =="__main__":
     tests = defaultTestLoader.loadTestsFromNames([sys.argv[0][:-3]])
@@ -78,7 +79,7 @@ class MultiTest(TestCase):
         
     def setUp(self):
         self.l = []
-        self.startport = 4044
+        self.startport = 4088
         for i in range(self.num):
             self.l.append(Khashmir('127.0.0.1', self.startport + i, '/tmp/%s.test' % (self.startport + i)))
         reactor.iterate()
@@ -113,8 +114,8 @@ class MultiTest(TestCase):
         
     def testStoreRetrieve(self):
         for i in range(10):
-            K = khash.newID()
-            V = khash.newID()
+            K = newID()
+            V = newID()
             
             for a in range(3):
                 self.done = 0
@@ -139,33 +140,6 @@ class MultiTest(TestCase):
                         reactor.iterate()
 
 
-            K = khash.newID()
-            l = map(lambda a: newID(), range(8))
-            for a in range(3):
-                self.done = 0
-                def _scb(val):
-                    self.done = 1
-                self.l[randrange(0, self.num)].storeValueForKey(K, l, _scb)
-                while not self.done:
-                    reactor.iterate()
-
-
-                c = []
-                def _rcb(val):
-                    if not val:
-                        self.done = 1
-                        self.assertEqual(self.got, 1)
-                    for n in val:
-                        c.remove(n)
-                        if not c:
-                            self.got = 1
-                for x in range(3):
-                    self.got = 0
-                    self.done = 0
-                    c = copy(l)
-                    self.l[randrange(0, self.num)].valueForKey(K, _rcb)
-                    while not self.done:
-                        reactor.iterate()