From 060d20f5a5d9f3276951eac6af3f18351c192163 Mon Sep 17 00:00:00 2001 From: Rob Blafford Date: Wed, 23 Nov 2022 16:00:33 -0500 Subject: [PATCH] rptest: Retry get_license() if failed - Fixes: #7363 (cherry picked from commit 246101b26d6f6bfba42c0b01ccf6c03123ad1544) --- tests/rptest/tests/license_upgrade_test.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/rptest/tests/license_upgrade_test.py b/tests/rptest/tests/license_upgrade_test.py index 90796e3c8f65..91355f161b02 100644 --- a/tests/rptest/tests/license_upgrade_test.py +++ b/tests/rptest/tests/license_upgrade_test.py @@ -136,7 +136,7 @@ def test_license_upgrade(self): return # Upload a license - self.admin.put_license(license) + assert self.admin.put_license(license).status_code == 200 # Update all nodes to newest version self.installer.install(self.redpanda.nodes, RedpandaInstaller.HEAD) @@ -144,5 +144,11 @@ def test_license_upgrade(self): _ = wait_for_num_versions(self.redpanda, 1) # Attempt to read license written by older version - license = self.admin.get_license() - assert license is not None and license['loaded'] is True + def license_loaded_ok(): + license = self.admin.get_license() + return license is not None and license['loaded'] is True + + wait_until(license_loaded_ok, + timeout_sec=30, + backoff_sec=1, + err_msg="Timeout waiting for license to exist in cluster")