diff options
| author | Christian Adams <chadams@redhat.com> | 2020-03-18 17:48:40 +0100 |
|---|---|---|
| committer | Christian Adams <chadams@redhat.com> | 2020-03-18 19:02:33 +0100 |
| commit | 4a0c371014c53602caad2c3d7fdb1f05b6c2ba69 (patch) | |
| tree | 7418bcd5539c97ddd899a1d42822f958f63aacf1 | |
| parent | Merge pull request #6318 from AlexSCorey/6100-ConvertWFJTandJTtoHooks (diff) | |
| download | awx-4a0c371014c53602caad2c3d7fdb1f05b6c2ba69.tar.xz awx-4a0c371014c53602caad2c3d7fdb1f05b6c2ba69.zip | |
Fix flaky workflow test & set junit family
| -rw-r--r-- | awx/main/tests/unit/test_access.py | 3 | ||||
| -rw-r--r-- | awxkit/tox.ini | 1 | ||||
| -rw-r--r-- | pytest.ini | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/awx/main/tests/unit/test_access.py b/awx/main/tests/unit/test_access.py index abef7df728..49c2a54467 100644 --- a/awx/main/tests/unit/test_access.py +++ b/awx/main/tests/unit/test_access.py @@ -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.""" class RoleReturnsTrue(Role): + class Meta: + proxy = True + def __contains__(self, accessor): return True diff --git a/awxkit/tox.ini b/awxkit/tox.ini index 7f9509259c..7931be5491 100644 --- a/awxkit/tox.ini +++ b/awxkit/tox.ini @@ -43,3 +43,4 @@ max-line-length = 120 [pytest] addopts = -v --tb=native +junit_family=xunit2
\ No newline at end of file diff --git a/pytest.ini b/pytest.ini index b01407052a..ecdcd74b9d 100644 --- a/pytest.ini +++ b/pytest.ini @@ -8,3 +8,4 @@ markers = ac: access control test survey: tests related to survey feature inventory_import: tests of code used by inventory import command +junit_family=xunit2
\ No newline at end of file |