Changeset 2ae03043 in trunk

Timestamp:

2020-11-19T17:04:02Z (4 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

bcc509b

Parents:

ad893c9

Message:

Another passing Python 3 test.

File:

• src/allmydata/test/test_introducer.py (modified) (3 diffs)

src/allmydata/test/test_introducer.py ¶

@@ +1 @@
+from past.builtins import unicode
 from six import ensure_binary, ensure_text
 
@@ -909 +910 @@
         self.failUnlessEqual(outbound["sA"]["seqnum"], 1)
         nonce1 = outbound["sA"]["nonce"]
-        self.failUnless(isinstance(nonce1, str))
+        self.failUnless(isinstance(nonce1, bytes))
+        # Make nonce unicode, to match JSON:
+        outbound["sA"]["nonce"] = unicode(nonce1, "utf-8")
         self.failUnlessEqual(json.loads(published["sA"][0]),
                              outbound["sA"])
@@ -923 +926 @@
         self.failUnlessEqual(outbound["sA"]["seqnum"], 2)
         nonce2 = outbound["sA"]["nonce"]
-        self.failUnless(isinstance(nonce2, str))
+        self.failUnless(isinstance(nonce2, bytes))
         self.failIfEqual(nonce1, nonce2)
+        # Make nonce unicode, to match JSON:
+        outbound["sA"]["nonce"] = unicode(nonce2, "utf-8")
+        outbound["sB"]["nonce"] = unicode(outbound["sB"]["nonce"], "utf-8")
         self.failUnlessEqual(json.loads(published["sA"][0]),
                              outbound["sA"])