From 7776905321e9612968143d8dc719ec97a8c90b48 Mon Sep 17 00:00:00 2001
From: Jonas L <jooola@users.noreply.github.com>
Date: Thu, 4 Apr 2024 11:54:54 +0200
Subject: [PATCH] test: force firewall cleanup before running server cleanup
 (#485)

##### SUMMARY

Cleanup the firewall before the server to prevent a server deletion
timeout.
---
 tests/integration/targets/firewall/tasks/cleanup.yml  | 11 ++++++-----
 .../targets/firewall_info/tasks/cleanup.yml           | 11 ++++++-----
 .../targets/firewall_resource/tasks/cleanup.yml       | 11 ++++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/tests/integration/targets/firewall/tasks/cleanup.yml b/tests/integration/targets/firewall/tasks/cleanup.yml
index 37fbd34..fd69ed5 100644
--- a/tests/integration/targets/firewall/tasks/cleanup.yml
+++ b/tests/integration/targets/firewall/tasks/cleanup.yml
@@ -1,10 +1,11 @@
 ---
-- name: Cleanup test_server
-  hetzner.hcloud.server:
-    name: "{{ hcloud_server_name }}"
-    state: absent
-
 - name: Cleanup test_firewall
   hetzner.hcloud.firewall:
     name: "{{ hcloud_firewall_name }}"
     state: absent
+    force: true
+
+- name: Cleanup test_server
+  hetzner.hcloud.server:
+    name: "{{ hcloud_server_name }}"
+    state: absent
diff --git a/tests/integration/targets/firewall_info/tasks/cleanup.yml b/tests/integration/targets/firewall_info/tasks/cleanup.yml
index 37fbd34..fd69ed5 100644
--- a/tests/integration/targets/firewall_info/tasks/cleanup.yml
+++ b/tests/integration/targets/firewall_info/tasks/cleanup.yml
@@ -1,10 +1,11 @@
 ---
-- name: Cleanup test_server
-  hetzner.hcloud.server:
-    name: "{{ hcloud_server_name }}"
-    state: absent
-
 - name: Cleanup test_firewall
   hetzner.hcloud.firewall:
     name: "{{ hcloud_firewall_name }}"
     state: absent
+    force: true
+
+- name: Cleanup test_server
+  hetzner.hcloud.server:
+    name: "{{ hcloud_server_name }}"
+    state: absent
diff --git a/tests/integration/targets/firewall_resource/tasks/cleanup.yml b/tests/integration/targets/firewall_resource/tasks/cleanup.yml
index 37fbd34..fd69ed5 100644
--- a/tests/integration/targets/firewall_resource/tasks/cleanup.yml
+++ b/tests/integration/targets/firewall_resource/tasks/cleanup.yml
@@ -1,10 +1,11 @@
 ---
-- name: Cleanup test_server
-  hetzner.hcloud.server:
-    name: "{{ hcloud_server_name }}"
-    state: absent
-
 - name: Cleanup test_firewall
   hetzner.hcloud.firewall:
     name: "{{ hcloud_firewall_name }}"
     state: absent
+    force: true
+
+- name: Cleanup test_server
+  hetzner.hcloud.server:
+    name: "{{ hcloud_server_name }}"
+    state: absent