Changeset 848 in xpra

Timestamp:

05/16/12 17:28:24 (12 months ago)

Author:

antoine

Message:

remove test code for old incremental bdecoder (already removed)

File:

• trunk/src/xpra/test_bencode.py (modified) (4 diffs)

trunk/src/xpra/test_bencode.py

@@ -4 +4 @@
 # later version. See the file COPYING for details.
 
-from xpra.bencode import IncrBDecode, bencode
-
-    
-def process(input):
-    bd = IncrBDecode()
-    bd.add(input)
-    return  bd.process()
+from xpra.bencode import bencode, bdecode
 
 def test_decoding():
-    
+
     def t(str, value, remainder):
         print(str)
         # Test "one-shot":
-        assert process(str) == (value, remainder)
+        rv, rr = bdecode(str)
+        assert rv == value, "expected value %s but got %s" % (rv, value)
+        rrstr = str[rr:]
+        assert rrstr == remainder, "expected remainder value %s but got %s" % (remainder, rrstr)
         # With gibberish added:
-        assert process(str + "asdf") == (value, remainder + "asdf")
-        # Byte at a time:
-        decoder = IncrBDecode()
-        for i, c in enumerate(str):
-            decoder.add(c)
-            retval = decoder.process()
-            if retval is not None:
-                print(retval)
-                assert retval == (value, "")
-                assert str[i + 1:] == remainder
-                break
+        g_str = str + "asdf"
+        rv, rr = bdecode(g_str)
+        assert rv == value, "expected value %s but got %s" % (rv, value)
+        rrstr = g_str[rr:]
+        assert rrstr.endswith("asdf")
 
     t("i12345e", 12345, "")
@@ -49 +40 @@
         print(str)
         try:
-            process(str)
-        except exc:
-            pass
-        else:
-            assert False, "didn't raise exception"
-        try:
-            decoder = IncrBDecode()
-            for c in str:
-                decoder.add(c)
-                decoder.process()
+            bdecode(str)
         except exc:
             pass
@@ -93 +75 @@
         if encstr:
             assert be==encstr
-        restored = process(be)
+        restored = bdecode(be)
         print("decode(%s)=%s" % (be, restored))
         list = restored[0]
@@ -111 +93 @@
                 print("value for %s does not match: %s vs %s" % (ok, ov, rv))
                 return list
-                
+
         return list