openstack
/
neutron
Code Issues Proposed changes

Merge "Handle DBConnectionError in skip_if_timeout decorator" into stable/rocky

This commit is contained in:
Zuul 2019-04-12 05:08:42 +00:00 committed by Gerrit Code Review
parent 0e71c29155 14ed5515b9
commit 65bee80deb
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

@ -31,6 +31,7 @@ from neutron_lib.db import api as db_api
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