X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/77d9c05d89dabc9e9e9a15f46cd12c8ad61ed64e..093ec98e4a065acfc537ea22c08c337c115fe273:/sdk/python/tests/test_cache.py

diff --git a/sdk/python/tests/test_cache.py b/sdk/python/tests/test_cache.py
index 4d68b401ee..259acd0a30 100644
--- a/sdk/python/tests/test_cache.py
+++ b/sdk/python/tests/test_cache.py
@@ -1,6 +1,13 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from __future__ import print_function
+from __future__ import absolute_import
 
-import md5
+from builtins import str
+from builtins import range
+import hashlib
 import mock
 import os
 import random
@@ -10,13 +17,13 @@ import tempfile
 import threading
 import unittest
 
-import arvados.cache
 import arvados
-import run_test_server
+import arvados.cache
+from . import run_test_server
 
 
 def _random(n):
-    return bytearray(random.getrandbits(8) for _ in xrange(n))
+    return bytearray(random.getrandbits(8) for _ in range(n))
 
 
 class CacheTestThread(threading.Thread):
@@ -31,15 +38,16 @@ class CacheTestThread(threading.Thread):
         for x in range(16):
             try:
                 data_in = _random(128)
-                data_in = md5.new(data_in).hexdigest() + "\n" + str(data_in)
+                data_in = hashlib.md5(data_in).hexdigest().encode() + b"\n" + data_in
                 c.set(url, data_in)
                 data_out = c.get(url)
-                digest, content = data_out.split("\n", 1)
-                if digest != md5.new(content).hexdigest():
+                digest, _, content = data_out.partition(b"\n")
+                if digest != hashlib.md5(content).hexdigest().encode():
                     self.ok = False
             except Exception as err:
                 self.ok = False
-                print("cache failed: {}".format(err), file=sys.stderr)
+                print("cache failed: {}: {}".format(type(err), err), file=sys.stderr)
+                raise
 
 
 class CacheTest(unittest.TestCase):