Skip to content

Commit 7ae47da

Browse files
committed
tests: Increase deletion timeouts of owned CRs
requeue is 5 minutes, so wait 6 minutes for deletion if the event is missed. Also applies to ApprovedImage status update. Signed-off-by: Jakob Naucke <jnaucke@redhat.com>
1 parent 9edc004 commit 7ae47da

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

test_utils/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ impl TestContext {
470470

471471
pub async fn cleanup(&self) -> Result<()> {
472472
self.delete_trusted_execution_cluster().await?;
473-
let timeout = scaled_duration(60);
473+
let timeout = scaled_duration(360);
474474
let msg = format!("Resources were left behind after {timeout:?}");
475475
let poller = Poller::new().with_timeout(timeout).with_error_message(msg);
476476
let chk = || async move {

tests/trusted_execution_cluster.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ named_test!(
112112
wait_for_resource_deleted(&deployments_api, REGISTER_SERVER_DEPLOYMENT, timeout).await?;
113113

114114
let images_api: Api<ApprovedImage> = Api::namespaced(client.clone(), namespace);
115-
wait_for_resource_deleted(&images_api, APPROVED_IMAGE_NAME, scaled_timeout(120)).await?;
115+
wait_for_resource_deleted(&images_api, APPROVED_IMAGE_NAME, scaled_timeout(360)).await?;
116116

117-
wait_for_resource_deleted(&machines, &machine_name, scaled_timeout(120)).await?;
118-
wait_for_resource_deleted(&attestation_keys, &ak_name, scaled_timeout(120)).await?;
117+
wait_for_resource_deleted(&machines, &machine_name, scaled_timeout(360)).await?;
118+
wait_for_resource_deleted(&attestation_keys, &ak_name, scaled_timeout(360)).await?;
119119
let secrets_api: Api<Secret> = Api::namespaced(client.clone(), namespace);
120120
wait_for_resource_deleted(&secrets_api, &ak_name, scaled_timeout(120)).await?;
121121

@@ -328,9 +328,9 @@ async fn test_attestation_key_lifecycle() -> anyhow::Result<()> {
328328
machines.delete(&machine_name, &dp).await?;
329329
test_ctx.info(format!("Deleted Machine: {machine_name}"));
330330

331-
wait_for_resource_deleted(&machines, &machine_name, scaled_timeout(120)).await?;
331+
wait_for_resource_deleted(&machines, &machine_name, scaled_timeout(360)).await?;
332332
test_ctx.info("Machine successfully deleted");
333-
wait_for_resource_deleted(&attestation_keys, &ak_name, scaled_timeout(120)).await?;
333+
wait_for_resource_deleted(&attestation_keys, &ak_name, scaled_timeout(360)).await?;
334334
test_ctx.info("AttestationKey successfully deleted");
335335
wait_for_resource_deleted(&secrets_api, &ak_name, scaled_timeout(120)).await?;
336336
test_ctx.info("Secret successfully deleted");
@@ -367,7 +367,7 @@ async fn test_nonexistent_approved_image() -> anyhow::Result<()> {
367367
};
368368
let done = await_condition(images, "coreos1", is_pending);
369369
let ctx = "waiting for ApprovedImage coreos1 to be PodPending";
370-
timeout(scaled_duration(30), done).await.context(ctx)??;
370+
timeout(scaled_duration(360), done).await.context(ctx)??;
371371

372372
test_ctx.cleanup().await?;
373373
Ok(())
@@ -398,7 +398,7 @@ async fn test_approved_image_readoption() -> anyhow::Result<()> {
398398
test_ctx.info(format!("Deleting TrustedExecutionCluster {TEC_NAME}"));
399399
clusters.delete(TEC_NAME, &Default::default()).await?;
400400
wait_for_resource_deleted(&configmaps, TRUSTEE_CONFIG_MAP, scaled_timeout(60)).await?;
401-
wait_for_resource_deleted(&images, APPROVED_IMAGE_NAME, scaled_timeout(60)).await?;
401+
wait_for_resource_deleted(&images, APPROVED_IMAGE_NAME, scaled_timeout(360)).await?;
402402
test_ctx.info(format!("Configmap {TRUSTEE_CONFIG_MAP} was removed"));
403403

404404
let image = ApprovedImage {

0 commit comments

Comments
 (0)