X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b4fd2ab4e409e36f894c1fb27144e4fa2854f389..3849ee94bbe65ef79df8f50c87b5445a5b1d4877:/sdk/python/tests/test_errors.py

diff --git a/sdk/python/tests/test_errors.py b/sdk/python/tests/test_errors.py
index cf06c8457c..4ee68ba285 100644
--- a/sdk/python/tests/test_errors.py
+++ b/sdk/python/tests/test_errors.py
@@ -1,17 +1,20 @@
-#!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 
+from __future__ import absolute_import
 import traceback
 import unittest
 
 import arvados.errors as arv_error
-import arvados_testutil as tutil
+from . import arvados_testutil as tutil
 
 class KeepRequestErrorTestCase(unittest.TestCase):
-    SERVICE_ERRORS = [
+    REQUEST_ERRORS = [
         ('http://keep1.zzzzz.example.org/', IOError("test IOError")),
         ('http://keep3.zzzzz.example.org/', MemoryError("test MemoryError")),
-        ('http://keep5.zzzzz.example.org/', tutil.fake_requests_response(
-                500, "test 500")),
+        ('http://keep5.zzzzz.example.org/',
+         arv_error.HttpError(500, "Internal Server Error")),
         ('http://keep7.zzzzz.example.org/', IOError("second test IOError")),
         ]
 
@@ -19,50 +22,54 @@ class KeepRequestErrorTestCase(unittest.TestCase):
         test_exc = arv_error.KeepRequestError("test message", *args)
         self.assertEqual("test message", test_exc.message)
 
-    def test_get_message_with_service_errors(self):
-        self.check_get_message(self.SERVICE_ERRORS[:])
+    def test_get_message_with_request_errors(self):
+        self.check_get_message(self.REQUEST_ERRORS[:])
 
-    def test_get_message_without_service_errors(self):
+    def test_get_message_without_request_errors(self):
         self.check_get_message()
 
-    def check_get_service_errors(self, *args):
+    def check_get_request_errors(self, *args):
         expected = dict(args[0]) if args else {}
         test_exc = arv_error.KeepRequestError("test service exceptions", *args)
-        self.assertEqual(expected, test_exc.service_errors())
+        self.assertEqual(expected, test_exc.request_errors())
 
-    def test_get_service_errors(self):
-        self.check_get_service_errors(self.SERVICE_ERRORS[:])
+    def test_get_request_errors(self):
+        self.check_get_request_errors(self.REQUEST_ERRORS[:])
 
-    def test_get_service_errors_none(self):
-        self.check_get_service_errors({})
+    def test_get_request_errors_none(self):
+        self.check_get_request_errors({})
 
     def test_empty_exception(self):
         test_exc = arv_error.KeepRequestError()
         self.assertFalse(test_exc.message)
-        self.assertEqual({}, test_exc.service_errors())
+        self.assertEqual({}, test_exc.request_errors())
 
     def traceback_str(self, exc):
         return traceback.format_exception_only(type(exc), exc)[-1]
 
-    def test_traceback_str_without_service_errors(self):
+    def test_traceback_str_without_request_errors(self):
         message = "test plain traceback string"
         test_exc = arv_error.KeepRequestError(message)
         exc_report = self.traceback_str(test_exc)
-        self.assertTrue(exc_report.startswith("KeepRequestError: "))
+        self.assertRegex(exc_report, r"^(arvados\.errors\.)?KeepRequestError: ")
         self.assertIn(message, exc_report)
 
-    def test_traceback_str_with_service_errors(self):
+    def test_traceback_str_with_request_errors(self):
         message = "test traceback shows Keep services"
-        test_exc = arv_error.KeepRequestError(message, self.SERVICE_ERRORS[:])
+        test_exc = arv_error.KeepRequestError(message, self.REQUEST_ERRORS[:])
         exc_report = self.traceback_str(test_exc)
-        self.assertTrue(exc_report.startswith("KeepRequestError: "))
-        for expect_substr in [message, "raised IOError", "raised MemoryError",
-                              "test MemoryError", "second test IOError",
-                              "responded with 500 Internal Server Error"]:
-            self.assertIn(expect_substr, exc_report)
+        self.assertRegex(exc_report, r"^(arvados\.errors\.)?KeepRequestError: ")
+        self.assertIn(message, exc_report)
+        for expect_re in [
+                r"raised (IOError|OSError)", # IOError in Python2, OSError in Python3
+                r"raised MemoryError",
+                r"test MemoryError",
+                r"second test IOError",
+                r"responded with 500 Internal Server Error"]:
+            self.assertRegex(exc_report, expect_re)
         # Assert the report maintains order of listed services.
         last_index = -1
-        for service_key, _ in self.SERVICE_ERRORS:
+        for service_key, _ in self.REQUEST_ERRORS:
             service_index = exc_report.find(service_key)
             self.assertGreater(service_index, last_index)
             last_index = service_index