11345: Fix unit tests after refactoring error types.

[arvados.git] / services / nodemanager / arvnodeman / computenode / __init__.py

diff --git a/services/nodemanager/arvnodeman/computenode/__init__.py b/services/nodemanager/arvnodeman/computenode/__init__.py
index 7cf9d63d5e178b4bbddebce2bda6b6e4d14b5ea0..b11b2de9ef0a6bd1daf6baff2909aec85a2fb7fc 100644 (file)
--- a/services/nodemanager/arvnodeman/computenode/__init__.py
+++ b/services/nodemanager/arvnodeman/computenode/__init__.py
@@ -8,6 +8,7 @@ import itertools
 import re
 import time
 
+from ..config import CLOUD_ERRORS
 from libcloud.common.exceptions import BaseHTTPError
 
 ARVADOS_TIMEFMT = '%Y-%m-%dT%H:%M:%SZ'
@@ -86,7 +87,7 @@ class RetryMixin(object):
                                     pass
                             if error.code == 429 or error.code >= 500:
                                 should_retry = True
-                        elif isinstance(error, errors):
+                        elif isinstance(error, CLOUD_ERRORS) or isinstance(error, errors) or type(error) is Exception:
                             should_retry = True
 
                         if not should_retry: