From d4e65b8c6c85ad86caad66ad016e27387a138c09 Mon Sep 17 00:00:00 2001 From: Michael Boquard Date: Tue, 1 Oct 2024 20:09:51 -0400 Subject: [PATCH] dt/debug-bundle: Fixed tests Thanks to some merge ordering schenangians, these tests started failing when #23557 merged after #23508. This change addresses the test bug by properly obtaining the configuration property and handling a situation when the debug bundle directory configuration is empty. Signed-off-by: Michael Boquard --- tests/rptest/tests/debug_bundle_test.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/rptest/tests/debug_bundle_test.py b/tests/rptest/tests/debug_bundle_test.py index d6d878f28240..7867e7fadd31 100644 --- a/tests/rptest/tests/debug_bundle_test.py +++ b/tests/rptest/tests/debug_bundle_test.py @@ -26,6 +26,7 @@ class DebugBundleTest(RedpandaTest): + debug_bundle_dir_config = "debug_bundle_storage_dir" """ Smoke test for debug bundle admin API """ @@ -106,13 +107,16 @@ def test_post_debug_bundle(self, ignore_none: bool): res = admin.get_debug_bundle_file(filename=filename, node=node) assert res.status_code == requests.codes.ok, res.json() assert res.headers['Content-Type'] == 'application/zip', res.json() + data_dir = None try: - data_dir = admin.get_cluster_config(node=node, - key="debug_bundle_storage_dir") + data_dir = admin.get_cluster_config( + node=node, + key=self.debug_bundle_dir_config)[self.debug_bundle_dir_config] except requests.HTTPError as e: - data_dir = admin.get_node_config( - node=node - )['data_directory']['data_directory'] + "/debug-bundle" + pass + + data_dir = data_dir or admin.get_node_config( + node=node)['data_directory']['data_directory'] + "/debug-bundle" file = f"{data_dir}/{filename}" assert self._get_sha256sum(node, file) == hashlib.sha256(