From 48f30c5106e6270fe429887d2c667fb04d6e1385 Mon Sep 17 00:00:00 2001
From: Alan Rominger <arominge@redhat.com>
Date: Tue, 15 Sep 2020 22:03:37 -0400
Subject: [PATCH 1/2] Fix AWX collection import test interference with Default
 organization

---
 .../tests/integration/targets/tower_import/tasks/main.yml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx_collection/tests/integration/targets/tower_import/tasks/main.yml b/awx_collection/tests/integration/targets/tower_import/tasks/main.yml
index 9835ff89a5..fa996f642b 100644
--- a/awx_collection/tests/integration/targets/tower_import/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_import/tasks/main.yml
@@ -25,7 +25,7 @@
                 notification_templates_error: []
                 notification_templates_approvals: []
               natural_key:
-                name: "Default"
+                name: "{{ org_name1 }}"
                 type: "organization"
       register: import_output
 
@@ -48,7 +48,7 @@
                 notification_templates_error: []
                 notification_templates_approvals: []
               natural_key:
-                name: "Default"
+                name: "{{ org_name1 }}"
                 type: "organization"
       register: import_output
       ignore_errors: true
@@ -76,7 +76,7 @@
                                 "notification_templates_approvals": []
                            },
                            "natural_key": {
-                                "name": "Default",
+                                "name": "{{ org_name2 }}",
                                 "type": "organization"
                            }
                       }

From e177432b8f8404622763deb15d04833c65a90755 Mon Sep 17 00:00:00 2001
From: Alan Rominger <arominge@redhat.com>
Date: Wed, 16 Sep 2020 10:34:11 -0400
Subject: [PATCH 2/2] Do not expect failure in tower_import test

---
 .../tests/integration/targets/tower_import/tasks/main.yml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx_collection/tests/integration/targets/tower_import/tasks/main.yml b/awx_collection/tests/integration/targets/tower_import/tasks/main.yml
index fa996f642b..dbfaf5c06a 100644
--- a/awx_collection/tests/integration/targets/tower_import/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_import/tasks/main.yml
@@ -33,7 +33,7 @@
         that:
           - import_output is changed
 
-    - name: "Import something again (awxkit is not idempotent, this tests a failure)"
+    - name: "Import the same thing again"
       tower_import:
         assets:
           organizations:
@@ -55,8 +55,8 @@
 
     - assert:
         that:
-          - import_output is failed
-          - "'Organization with this Name already exists' in import_output.msg"
+          - import_output is not failed
+          # - import_output is not changed  # FIXME: module not idempotent
 
     - name: "Write out a json file"
       copy: