External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6330 from rooftopcellist/fix_flakey_workflow_functest

Browse Source 
Fix flaky workflow test & set junit family

Reviewed-by: Christian Adams <rooftopcellist@gmail.com>
             https://github.com/rooftopcellist
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-03-18 19:27:26 +00:00
committed by GitHub
parent 6b43da35e1 4a0c371014
commit eda494be63
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/tests/unit/test_access.py
View File

@@ -183,6 +183,9 @@ def test_change_jt_sensitive_data(job_template_with_ids, mocker, user_unit):
"""Assure that can_add is called with all ForeignKeys.""" """Assure that can_add is called with all ForeignKeys."""
class RoleReturnsTrue(Role): class RoleReturnsTrue(Role):
class Meta:
proxy = True
def __contains__(self, accessor): def __contains__(self, accessor):
return True return True

1
awxkit/tox.ini
View File

@@ -43,3 +43,4 @@ max-line-length = 120
[pytest] [pytest]
addopts = -v --tb=native addopts = -v --tb=native
junit_family=xunit2

1
pytest.ini
View File

@@ -8,3 +8,4 @@ markers =
ac: access control test ac: access control test
survey: tests related to survey feature survey: tests related to survey feature
inventory_import: tests of code used by inventory import command inventory_import: tests of code used by inventory import command
junit_family=xunit2