From cb1ba9e3a4eafbd26753caedbb8ffd72ec92c444 Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Wed, 23 Sep 2020 09:03:03 -0400
Subject: [PATCH] Fixing zuul issues

---
 awx_collection/test/awx/test_application.py                  | 5 +++--
 .../integration/targets/tower_application/tasks/main.yml     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/awx_collection/test/awx/test_application.py b/awx_collection/test/awx/test_application.py
index 1ccb78c7d2..a646a30bb7 100644
--- a/awx_collection/test/awx/test_application.py
+++ b/awx_collection/test/awx/test_application.py
@@ -3,7 +3,8 @@ __metaclass__ = type
 
 import pytest
 
-from awx.main.models import Organization, Application
+from awx.main.models import Organization
+from awx.main.models.oauth import OAuth2AccessToken, OAuth2Application
 
 
 @pytest.mark.django_db
@@ -22,7 +23,7 @@ def test_create_application(run_module, admin_user):
     result = run_module('tower_application', module_args, admin_user)
     assert result.get('changed'), result
 
-    application = Application.objects.get(name='foo_app')
+    application = OAuth2Application.objects.get(name='foo_app')
     assert application.description == 'barfoo'
     assert application.organization_id == org.id
 
diff --git a/awx_collection/tests/integration/targets/tower_application/tasks/main.yml b/awx_collection/tests/integration/targets/tower_application/tasks/main.yml
index 212aec884b..cde2440075 100644
--- a/awx_collection/tests/integration/targets/tower_application/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_application/tasks/main.yml
@@ -56,7 +56,7 @@
         name: "{{ app3_name }}"
         organization: "Default"
         description: "All Trusting Application"
-        skip_authorization: True
+        skip_authorization: true
         authorization_grant_type: "password"
         client_type: "confidential"
         state: present