From 6eff75e86ac0d70eb7622fb79d5ffa45c574e6d5 Mon Sep 17 00:00:00 2001
From: Mark Chappell <mchappel@redhat.com>
Date: Mon, 4 Oct 2021 17:34:08 +0200
Subject: [PATCH] Fix ec2_eni integration tests - ensure VM state

---
 tests/integration/targets/ec2_eni/aliases            |  3 +--
 .../targets/ec2_eni/tasks/test_attachment.yaml       | 12 ++++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/integration/targets/ec2_eni/aliases b/tests/integration/targets/ec2_eni/aliases
index 4fc9a91e159..9adce456758 100644
--- a/tests/integration/targets/ec2_eni/aliases
+++ b/tests/integration/targets/ec2_eni/aliases
@@ -1,4 +1,3 @@
-unstable
-
 cloud/aws
+
 ec2_eni_info
diff --git a/tests/integration/targets/ec2_eni/tasks/test_attachment.yaml b/tests/integration/targets/ec2_eni/tasks/test_attachment.yaml
index a58af1dfe69..333b9f538a8 100644
--- a/tests/integration/targets/ec2_eni/tasks/test_attachment.yaml
+++ b/tests/integration/targets/ec2_eni/tasks/test_attachment.yaml
@@ -1,7 +1,8 @@
   # ============================================================
-- name: Ensure test instances are running
+# If we don't stop the instances they can get stuck "detaching"
+- name: Ensure test instances are stopped
   ec2_instance:
-    state: running
+    state: stopped
     instance_ids:
       - "{{ instance_id_1 }}"
       - "{{ instance_id_2 }}"
@@ -174,6 +175,13 @@
       - '"currently in use" in result.msg'
 
 # ============================================================
+- name: Ensure test instances is running (will block non-forced detachment)
+  ec2_instance:
+    state: running
+    instance_ids:
+      - "{{ instance_id_2 }}"
+    wait: True
+
 - name: delete an attached network interface with force_detach
   ec2_eni:
     force_detach: True