Merge branch 'devel' of github.com:ansible/ansible-tower into rbac

2026-05-04 07:51:58 -05:00 · 2016-03-31 11:32:02 -04:00
parent 2de83e63c3 359da2d958
commit 219c09728d
79 changed files with 4285 additions and 2283 deletions
--- a/awx/main/tests/functional/api/test_organization_counts.py
+++ b/awx/main/tests/functional/api/test_organization_counts.py
@@ -128,6 +128,7 @@ def test_two_organizations(resourced_organization, organizations, user, get):
        'teams': 0
    }

+@pytest.mark.skip(reason="resolution planned for after RBAC merge")
@pytest.mark.django_db
@pytest.mark.skipif("True") # XXX: This needs to be implemented
 def test_JT_associated_with_project(organizations, project, user, get):