openstack/neutron
Code Issues Proposed changes

Handle DBConnectionError in skip_if_timeout decorator

Browse Source 
In some cases it may happen that when db test will fail due
to timeout oslo_db.exception.DBConnectionError will be raised
instead of sqlalchemy_exc.InterfaceError.
This patch adds handling such case in skip_if_timeout decorator.

Change-Id: I7350d5c884784317c94ff42f28526065ff399b40
Related-Bug: #1687027
(cherry picked from commit b7458b615972dc6ff93a12abbd0a8f32e8da55eb)
This commit is contained in:
Slawek Kaplonski 2019-04-09 22:04:36 +02:00
parent f0a88de46f
commit 3d434814ef
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/tests/base.py
View File

@ -30,6 +30,7 @@ from neutron_lib.callbacks import manager as registry_manager
from neutron_lib import fixture
from oslo_concurrency.fixture import lockutils
from oslo_config import cfg
from oslo_db import exception as db_exceptions
from oslo_db import options as db_options
from oslo_messaging import conffixture as messaging_conffixture
from oslo_utils import excutils
@ -123,7 +124,8 @@ def skip_if_timeout(reason):
msg = ("Timeout raised for test %s, skipping it "
"because of: %s") % (self.id(), reason)
raise self.skipTest(msg)
except sqlalchemy_exc.InterfaceError:
except (sqlalchemy_exc.InterfaceError,
db_exceptions.DBConnectionError):
# In case of db tests very often TimeoutException is reason of
# some sqlalchemy InterfaceError exception and that is final
# raised exception which needs to be handled