Merge pull request #6330 from rooftopcellist/fix_flakey_workflow_functest

Fix flaky workflow test & set junit family

Reviewed-by: Christian Adams <rooftopcellist@gmail.com>
             https://github.com/rooftopcellist

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
 

awxkit/tox.ini

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

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