Skip to content

Commit 4387386

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "[FT] Add a timeout for the NB/SB connection stop method" into stable/2023.1
2 parents 27eee0b + 603f388 commit 4387386

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

neutron/tests/functional/base.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,12 @@ def stop(self):
408408
if self.maintenance_worker:
409409
self.mech_driver.nb_synchronizer.stop()
410410
self.mech_driver.sb_synchronizer.stop()
411-
self.mech_driver.nb_ovn.ovsdb_connection.stop()
412-
self.mech_driver.sb_ovn.ovsdb_connection.stop()
411+
for ovn_conn in (self.mech_driver.nb_ovn.ovsdb_connection,
412+
self.mech_driver.sb_ovn.ovsdb_connection):
413+
try:
414+
ovn_conn.stop(timeout=10)
415+
except Exception: # pylint:disable=bare-except
416+
pass
413417

414418
def restart(self):
415419
self.stop()

0 commit comments

Comments
 (0)