cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move import sanity test files into own directory. (#35593)

Browse source
This commit is contained in:
Matt Clay 2018-02-01 09:52:31 -08:00 committed by GitHub
parent e8d8c5b19c
commit b9c5147be2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/runner/lib/sanity/import.py
View file

@ -75,11 +75,11 @@ class ImportTest(SanityMultipleVersion):
# add the importer to our virtual environment so it can be accessed through the coverage injector # add the importer to our virtual environment so it can be accessed through the coverage injector
importer_path = os.path.join(virtual_environment_bin, 'importer.py') importer_path = os.path.join(virtual_environment_bin, 'importer.py')
if not args.explain: if not args.explain:
os.symlink(os.path.abspath('test/runner/importer.py'), importer_path) os.symlink(os.path.abspath('test/sanity/import/importer.py'), importer_path)
# activate the virtual environment # activate the virtual environment
env['PATH'] = '%s:%s' % (virtual_environment_bin, env['PATH']) env['PATH'] = '%s:%s' % (virtual_environment_bin, env['PATH'])
env['PYTHONPATH'] = os.path.abspath('test/runner/import/lib') env['PYTHONPATH'] = os.path.abspath('test/sanity/import/lib')
# make sure coverage is available in the virtual environment if needed # make sure coverage is available in the virtual environment if needed
if args.coverage: if args.coverage:

2
test/sanity/code-smell/no-underscore-variable.sh
View file

@ -101,7 +101,7 @@ TO_BE_FIXED='
./lib/ansible/plugins/strategy/linear.py ./lib/ansible/plugins/strategy/linear.py
./test/legacy/cleanup_gce.py ./test/legacy/cleanup_gce.py
./test/legacy/gce_credentials.py ./test/legacy/gce_credentials.py
./test/runner/importer.py ./test/sanity/import/importer.py
./test/runner/lib/cloud/cs.py ./test/runner/lib/cloud/cs.py
./test/runner/lib/core_ci.py ./test/runner/lib/core_ci.py
./test/runner/lib/delegation.py ./test/runner/lib/delegation.py

2
test/runner/importer.py → test/sanity/import/importer.py
View file

@ -41,7 +41,7 @@ def main():
for result in results: for result in results:
if result[0].startswith(base_dir): if result[0].startswith(base_dir):
source = result[0][len(base_dir) + 1:].replace('test/runner/import/', '') source = result[0][len(base_dir) + 1:].replace('test/sanity/import/', '')
line = result[1] or 0 line = result[1] or 0
break break

0
test/runner/import/lib/ansible/__init__.py → test/sanity/import/lib/ansible/__init__.py
View file

0
test/runner/import/lib/ansible/module_utils → test/sanity/import/lib/ansible/module_utils
View file

4
test/sanity/pylint/ignore.txt
View file

@ -69,7 +69,6 @@ lib/ansible/modules/storage/purestorage/purefa_pg.py ansible-format-automatic-sp
lib/ansible/modules/system/firewalld.py ansible-format-automatic-specification lib/ansible/modules/system/firewalld.py ansible-format-automatic-specification
lib/ansible/plugins/cliconf/junos.py ansible-no-format-on-bytestring 3 lib/ansible/plugins/cliconf/junos.py ansible-no-format-on-bytestring 3
lib/ansible/plugins/cliconf/nxos.py ansible-format-automatic-specification lib/ansible/plugins/cliconf/nxos.py ansible-format-automatic-specification
test/runner/importer.py missing-docstring 3.7
test/runner/injector/importer.py missing-docstring 3.7 test/runner/injector/importer.py missing-docstring 3.7
test/runner/injector/injector.py missing-docstring 3.7 test/runner/injector/injector.py missing-docstring 3.7
test/runner/lib/ansible_util.py missing-docstring 3.7 test/runner/lib/ansible_util.py missing-docstring 3.7
@ -97,8 +96,10 @@ test/runner/lib/powershell_import_analysis.py missing-docstring 3.7
test/runner/lib/pytar.py missing-docstring 3.7 test/runner/lib/pytar.py missing-docstring 3.7
test/runner/lib/sanity/__init__.py missing-docstring 3.7 test/runner/lib/sanity/__init__.py missing-docstring 3.7
test/runner/lib/sanity/ansible_doc.py missing-docstring 3.7 test/runner/lib/sanity/ansible_doc.py missing-docstring 3.7
test/runner/lib/sanity/compile.py missing-docstring 3.7
test/runner/lib/sanity/import.py missing-docstring 3.7 test/runner/lib/sanity/import.py missing-docstring 3.7
test/runner/lib/sanity/pep8.py missing-docstring 3.7 test/runner/lib/sanity/pep8.py missing-docstring 3.7
test/runner/lib/sanity/pslint.py missing-docstring 3.7
test/runner/lib/sanity/pylint.py missing-docstring 3.7 test/runner/lib/sanity/pylint.py missing-docstring 3.7
test/runner/lib/sanity/rstcheck.py missing-docstring 3.7 test/runner/lib/sanity/rstcheck.py missing-docstring 3.7
test/runner/lib/sanity/sanity_docs.py missing-docstring 3.7 test/runner/lib/sanity/sanity_docs.py missing-docstring 3.7
@ -113,3 +114,4 @@ test/runner/retry.py missing-docstring 3.7
test/runner/shippable.py missing-docstring 3.7 test/runner/shippable.py missing-docstring 3.7
test/runner/test.py missing-docstring 3.7 test/runner/test.py missing-docstring 3.7
test/runner/units/test_diff.py missing-docstring 3.7 test/runner/units/test_diff.py missing-docstring 3.7
test/sanity/import/importer.py missing-docstring 3.7