Resolve actions conflicts and delete unwatned files

Bump migrations and delete some files

Resolve remaining conflicts

Fix requirements

Flake8 fixes

Prefer devel changes for schema

Use correct versions

Remove sso connected stuff

Update to modern actions and collection fixes

Remove unwated alias

Version problems in actions

Fix more versioning problems

Update warning string

Messed it up again

Shorten exception

More removals

Remove pbr license

Remove tests deleted in devel

Remove unexpected files

Remove some content missed in the rebase

Use sleep_task from devel

Restore devel live conftest file

Add in settings that got missed

Prefer devel version of collection test

Finish repairing .github path

Remove unintended test file duplication

Undo more unintended file additions

awx_collection/test/awx/conftest.py

@@ -19,11 +19,8 @@ from ansible.module_utils.six import raise_from
 
 from ansible_base.rbac.models import RoleDefinition, DABPermission
 from ansible_base.rbac import permission_registry
-<<<<<<< HEAD
 
 from awx.main.tests.conftest import load_all_credentials  # noqa: F401; pylint: disable=unused-import
-=======
->>>>>>> tower/test_stable-2.6
 from awx.main.tests.functional.conftest import _request
 from awx.main.tests.functional.conftest import credentialtype_scm, credentialtype_ssh  # noqa: F401; pylint: disable=unused-import
 from awx.main.models import (

awx_collection/test/awx/test_organization.py

@@ -20,10 +20,7 @@ def test_create_organization(run_module, admin_user):
         'controller_username': None,
         'controller_password': None,
         'validate_certs': None,
-<<<<<<< HEAD
-=======
         'aap_token': None,
->>>>>>> tower/test_stable-2.6
         'controller_config_file': None,
     }
 
@@ -56,10 +53,7 @@ def test_galaxy_credential_order(run_module, admin_user):
         'controller_username': None,
         'controller_password': None,
         'validate_certs': None,
-<<<<<<< HEAD
-=======
         'aap_token': None,
->>>>>>> tower/test_stable-2.6
         'controller_config_file': None,
         'galaxy_credentials': cred_ids,
     }
@@ -84,10 +78,7 @@ def test_galaxy_credential_order(run_module, admin_user):
         'controller_username': None,
         'controller_password': None,
         'validate_certs': None,
-<<<<<<< HEAD
-=======
         'aap_token': None,
->>>>>>> tower/test_stable-2.6
         'controller_config_file': None,
         'galaxy_credentials': cred_ids,
     }

awx_collection/test/awx/test_token.py

@@ -1,30 +0,0 @@
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-import pytest
-
-from awx.main.models import OAuth2AccessToken
-
-
-@pytest.mark.django_db
-def test_create_token(run_module, admin_user):
-
-    module_args = {
-        'description': 'barfoo',
-        'state': 'present',
-        'scope': 'read',
-        'controller_host': None,
-        'controller_username': None,
-        'controller_password': None,
-        'validate_certs': None,
-        'aap_token': None,
-        'controller_config_file': None,
-    }
-
-    result = run_module('token', module_args, admin_user)
-    assert result.get('changed'), result
-
-    tokens = OAuth2AccessToken.objects.filter(description='barfoo')
-    assert len(tokens) == 1, 'Tokens with description of barfoo != 0: {0}'.format(len(tokens))
-    assert tokens[0].scope == 'read', 'Token was not given read access'