From ba892f62d7d0187b830a7e1fa4cac13c2e82264a Mon Sep 17 00:00:00 2001 From: innobead Date: Mon, 15 Jan 2024 15:34:38 +0000 Subject: [PATCH] Update testing docs Signed-off-by: innobead --- integration/common.html | 32 ++++++++++++++++++++++++++++ integration/test_engine_upgrade.html | 17 ++++++++------- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/integration/common.html b/integration/common.html index 3a7e53af00..b15f9f6ba8 100644 --- a/integration/common.html +++ b/integration/common.html @@ -2219,6 +2219,17 @@

Module tests.common

return image +def wait_for_engine_image_incompatible(client, image_name): + wait_for_engine_image_creation(client, image_name) + for i in range(RETRY_COUNTS): + image = client.by_id_engine_image(image_name) + if image.incompatible: + break + time.sleep(RETRY_INTERVAL) + assert image.incompatible + return image + + def wait_for_engine_image_condition(client, image_name, state): """ state: "True", "False" @@ -13198,6 +13209,26 @@

Returns

assert deleted +
+def wait_for_engine_image_incompatible(client, image_name) +
+
+
+
+ +Expand source code + +
def wait_for_engine_image_incompatible(client, image_name):
+    wait_for_engine_image_creation(client, image_name)
+    for i in range(RETRY_COUNTS):
+        image = client.by_id_engine_image(image_name)
+        if image.incompatible:
+            break
+        time.sleep(RETRY_INTERVAL)
+    assert image.incompatible
+    return image
+
+
def wait_for_engine_image_ref_count(client, image_name, count)
@@ -15479,6 +15510,7 @@

Index

  • wait_for_engine_image_condition
  • wait_for_engine_image_creation
  • wait_for_engine_image_deletion
    • +
  • wait_for_engine_image_incompatible
  • wait_for_engine_image_ref_count
  • wait_for_engine_image_state
  • wait_for_expansion_error_clear
    • diff --git a/integration/test_engine_upgrade.html b/integration/test_engine_upgrade.html index b54e599614..5627c0fc55 100644 --- a/integration/test_engine_upgrade.html +++ b/integration/test_engine_upgrade.html @@ -37,6 +37,7 @@

    Module tests.test_engine_upgrade

    from common import wait_for_volume_detached from common import wait_for_engine_image_deletion from common import wait_for_engine_image_ref_count, wait_for_engine_image_state +from common import wait_for_engine_image_incompatible from common import get_volume_engine, write_volume_random_data from common import check_volume_endpoint from common import wait_for_volume_replicas_mode @@ -478,8 +479,8 @@

    Module tests.test_engine_upgrade

    ctl_v, ctl_minv, data_v, data_minv) img = client.create_engine_image(image=fail_cli_v_image) - img = wait_for_engine_image_state(client, img.name, "incompatible") - assert img.state == "incompatible" + img = wait_for_engine_image_incompatible(client, img.name) + assert img.incompatible assert img.cliAPIVersion == cli_minv - 1 assert img.cliAPIMinVersion == cli_minv - 1 client.delete(img) @@ -490,8 +491,8 @@

    Module tests.test_engine_upgrade

    ctl_v, ctl_minv, data_v, data_minv) img = client.create_engine_image(image=fail_cli_minv_image) - img = wait_for_engine_image_state(client, img.name, "incompatible") - assert img.state == "incompatible" + img = wait_for_engine_image_incompatible(client, img.name) + assert img.incompatible assert img.cliAPIVersion == cli_v + 1 assert img.cliAPIMinVersion == cli_v + 1 client.delete(img) @@ -2204,8 +2205,8 @@

    Functions

    ctl_v, ctl_minv, data_v, data_minv) img = client.create_engine_image(image=fail_cli_v_image) - img = wait_for_engine_image_state(client, img.name, "incompatible") - assert img.state == "incompatible" + img = wait_for_engine_image_incompatible(client, img.name) + assert img.incompatible assert img.cliAPIVersion == cli_minv - 1 assert img.cliAPIMinVersion == cli_minv - 1 client.delete(img) @@ -2216,8 +2217,8 @@

    Functions

    ctl_v, ctl_minv, data_v, data_minv) img = client.create_engine_image(image=fail_cli_minv_image) - img = wait_for_engine_image_state(client, img.name, "incompatible") - assert img.state == "incompatible" + img = wait_for_engine_image_incompatible(client, img.name) + assert img.incompatible assert img.cliAPIVersion == cli_v + 1 assert img.cliAPIMinVersion == cli_v + 1 client.delete(img)