diff options
| author | Matt Clay <matt@mystile.com> | 2019-08-27 23:40:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 23:40:06 -0700 |
| commit | f5d829392a17e20d0ba02c30e5a377a43cf70cfd (patch) | |
| tree | 6dba1bdf24e10806d8713bfc18b1c7357b4a8ed7 /test/lib/ansible_test/_data/sanity/import/importer.py | |
| parent | bf108ee7bfc0270715fe26d143bc5885eb398fb5 (diff) | |
| download | ansible-f5d829392a17e20d0ba02c30e5a377a43cf70cfd.tar.gz | |
Overhaul ansible-test test path handling. (#61416)
* Remove .keep files from test/results/ dirs.
* Remove classification of test/results/ dir.
* Add results_relative to data context.
* Use variables in delegation paths.
* Standardize file writing and results paths.
* Fix issues reported by PyCharm.
* Clean up invocation of coverage command.
It now runs through the injector.
* Hack to allow intercept_command in cover.py.
* Simplify git ignore for test results.
* Use test result tmp dir instead of cache dir.
* Remove old .pytest_cache reference.
* Fix unit test docker delegation.
* Show HTML report link.
* Clean up more results references.
* Move import sanity test output to .tmp dir.
* Exclude test results dir from coverage.
* Fix import sanity test lib paths.
* Fix hard-coded import test paths.
* Fix most hard-coded integration test paths.
* Fix PyCharm warnings.
* Fix import placement.
* Fix integration test dir path.
* Fix Shippable scripts.
* Fix Shippable matrix check.
* Overhaul key pair management.
Diffstat (limited to 'test/lib/ansible_test/_data/sanity/import/importer.py')
| -rwxr-xr-x | test/lib/ansible_test/_data/sanity/import/importer.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/lib/ansible_test/_data/sanity/import/importer.py b/test/lib/ansible_test/_data/sanity/import/importer.py index d530ddb8bc..9e10cffed3 100755 --- a/test/lib/ansible_test/_data/sanity/import/importer.py +++ b/test/lib/ansible_test/_data/sanity/import/importer.py @@ -16,6 +16,9 @@ def main(): import traceback import warnings + import_dir = os.environ['SANITY_IMPORT_DIR'] + minimal_dir = os.environ['SANITY_MINIMAL_DIR'] + try: import importlib.util imp = None # pylint: disable=invalid-name @@ -266,9 +269,6 @@ def main(): filepath = os.path.relpath(warning.filename) lineno = warning.lineno - import_dir = 'test/runner/.tox/import/' - minimal_dir = 'test/runner/.tox/minimal-' - if filepath.startswith('../') or filepath.startswith(minimal_dir): # The warning occurred outside our source tree. # The best we can do is to report the file which was tested that triggered the warning. |