fix unit tests (mostly py3k string nonsense)

git-svn-id: https://xpra.org/svn/Xpra/trunk@14869 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/unittests/unit/server/proxy_server_test.py

@@ -14,8 +14,10 @@ class ProxyServerTest(ServerTestUtil):
 	def test_proxy_start_stop(self):
 		display = self.find_free_display()
 		log("using free display=%s" % display)
-		proxy = self.run_xpra(["proxy", display, "--no-daemon"])
-		assert pollwait(proxy, 5) is None, "proxy failed to start"
+		cmd = ["proxy", display, "--no-daemon"]
+		cmdstr = " ".join("'%s'" % c for c in cmd)
+		proxy = self.run_xpra(cmd)
+		assert pollwait(proxy, 5) is None, "proxy failed to start with cmd=%s" % cmdstr
 		assert display in self.dotxpra.displays(), "proxy display not found"
 		self.check_stop_server(proxy, "stop", display)
 

src/xpra/codecs/jpeg/decoder.pyx

@@ -203,10 +203,11 @@ def selftest(full=False):
         log("decompress(%i bytes)=%s", len(data), img)
         if full:
             try:
-                assert decompress(data[:len(data)//2], 16, 16) is not None
+                v = decompress(data[:len(data)//2], 16, 16)
+                assert v is not None
             except:
                 pass
             else:
-                raise Exception("should not be able to decompress incomplete data")
+                raise Exception("should not be able to decompress incomplete data, but got %s" % v)
     finally:
         pass

src/xpra/server/auth/pam_auth.py

@@ -5,6 +5,7 @@
 
 import sys
 from xpra.server.auth.sys_auth_base import SysAuthenticator, init, log
+from xpra.util import csv
 assert init and log #tests will disable logging from here
 
 
@@ -93,9 +94,9 @@ def check(self, password):
         return check(self.username, password)
 
     def get_challenge(self, digests):
-        if b"xor" not in digests:
-            raise Exception("pam authenticator requires the 'xor' digest")
-        return SysAuthenticator.get_challenge(self, [b"xor"])
+        if "xor" not in digests:
+            raise Exception("pam authenticator requires the 'xor' digest, not %s" % csv(digests))
+        return SysAuthenticator.get_challenge(self, ["xor"])
 
     def __repr__(self):
         return "PAM"

src/xpra/server/auth/sys_auth_base.py

@@ -98,7 +98,7 @@ def authenticate_hmac(self, challenge_response, client_salt):
             salt = self.salt
         else:
             salt = xor(self.salt, client_salt)
-            log("xoring salt: xor(%s, %s)=%s", self.salt, client_salt, binascii.hexlify(salt))
+            log("xoring salt: xor(%s, %s)=%s", self.salt, client_salt, binascii.hexlify(strtobytes(salt)))
         self.salt = None
         password = self.get_password()
         if not password:

src/xpra/server/server_core.py

@@ -219,7 +219,7 @@ def init_uuid(self):
         # Define a server UUID if needed:
         self.uuid = self.get_uuid()
         if not self.uuid:
-            self.uuid = unicode(get_hex_uuid())
+            self.uuid = bytestostr(get_hex_uuid())
             self.save_uuid()
         log("server uuid is %s", self.uuid)