External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 13:36:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix python3 Zuul error with awxkit

Browse Source
This commit is contained in:
John Westcott IV
2020-08-04 11:21:18 -04:00
parent 08e5dd87e6
commit 748bdbd2dd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx_collection/test/awx/conftest.py
View File

@@ -24,7 +24,10 @@ except ImportError:
HAS_TOWER_CLI = False HAS_TOWER_CLI = False
try: try:
import awxkit # Because awxkit will be a directory at the root of this makefile and we are using python3, import awxkit will work even if its not installed.
# However, awxkit will not contain api whih causes a stack failure down on line 170 when we try to mock it.
# So here we are importing awxkit.api to prevent that. Then you only get an error on tests for awxkit functionality.
import awxkit.api
HAS_AWX_KIT = True HAS_AWX_KIT = True
except ImportError: except ImportError:
HAS_AWX_KIT = False HAS_AWX_KIT = False