mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-28 04:06:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/pylib: Introduce ManagerClient.test_finished_event

Browse Source 
introduce ManagerClient.test_finished_event
to block access to REST client object from the test if
ManagerClient.after_test method was called
(test teardown started)
This commit is contained in:
Artsiom Mishuta
2024-05-14 14:42:26 +02:00
parent fb6b572b9e
commit d659d9338b
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/pylib/manager_client.py
View File

@@ -53,9 +53,17 @@ class ManagerClient():
self.api = ScyllaRESTAPIClient()
self.metrics = ScyllaMetricsClient()
self.thread_pool = ThreadPoolExecutor()
self.test_finished_event = asyncio.Event()
@property
def client(self):
if self.test_finished_event.is_set():
raise Exception("ManagerClient.after_test method was called, client object is not accessible anymore")
# there are still can be issue when some task first obtains the client object,
# but usually, tests obtains the manager and uses the client as manager.client
# and there is an actual workaround for this case.
# It is better to fix the task rather than every time doing
# close all clients in after_test->create new during after_test->close again after after_test.
_client = self.client_for_asyncio_loop.get(asyncio.get_running_loop(), None)
if _client is None:
_client = UnixRESTClient(self.sock_path)
@@ -129,8 +137,10 @@ class ManagerClient():
async def after_test(self, test_case_name: str, success: bool) -> None:
"""Tell harness this test finished"""
self.test_finished_event.set()
_client = self.client_for_asyncio_loop.get(asyncio.get_running_loop())
logger.debug("after_test for %s (success: %s)", test_case_name, success)
cluster_str = await self.client.put_json(f"/cluster/after-test/{success}",
cluster_str = await _client.put_json(f"/cluster/after-test/{success}",
response_type = "json")
logger.info("Cluster after test %s: %s", test_case_name, cluster_str)