summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-11-18 19:32:53 +0000
committerGerrit Code Review <review@openstack.org>2022-11-18 19:32:53 +0000
commitf417cde1086bd663036ff74d9907f2d2740d7e6c (patch)
tree4615ef8ebbce0a7970221fcfb03ad752106ffd8b
parent81d021cc73f49f00dabcc8ccb2c3e98d2d5b76df (diff)
parentfc9fd8a7ada48a1c2bc762b18814c1008b9f1df4 (diff)
downloadcinder-f417cde1086bd663036ff74d9907f2d2740d7e6c.tar.gz
Merge "Tests: Fix service stopping on cleanup" into stable/yoga
-rw-r--r--cinder/tests/unit/test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cinder/tests/unit/test.py b/cinder/tests/unit/test.py
index 21f2d1eb8..df9a3eebf 100644
--- a/cinder/tests/unit/test.py
+++ b/cinder/tests/unit/test.py
@@ -333,10 +333,10 @@ class TestCase(testtools.TestCase):
def _common_cleanup(self):
"""Runs after each test method to tear down test environment."""
- # Kill any services
+ # Stop any services (this stops RPC handlers)
for x in self._services:
try:
- x.kill()
+ x.stop()
except Exception:
pass