21721: Remove ruamel.yaml dependency

[arvados.git] / sdk / python / tests / test_cache.py

diff --git a/sdk/python/tests/test_cache.py b/sdk/python/tests/test_cache.py
index 1c00551e5ce0e0daa764561d33e126f76b43b677..d86c7337e124bfc6608d4ece513a71f17b63cf32 100644 (file)
--- a/sdk/python/tests/test_cache.py
+++ b/sdk/python/tests/test_cache.py
@@ -1,10 +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
 
 from builtins import str
 from builtins import range
 import hashlib
-import mock
 import os
 import random
 import shutil
@@ -13,11 +16,12 @@ import tempfile
 import threading
 import unittest
 
+from unittest import mock
+
 import arvados
 import arvados.cache
 from . import run_test_server
 
-
 def _random(n):
     return bytearray(random.getrandbits(8) for _ in range(n))
 
@@ -34,15 +38,16 @@ class CacheTestThread(threading.Thread):
         for x in range(16):
             try:
                 data_in = _random(128)
-                data_in = hashlib.md5(data_in).hexdigest() + bytes("\n") + bytes(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.partition("\n")
-                if digest != hashlib.md5(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):