Add --tox-sitepackages option to ansible-test.
This commit is contained in:
parent
dd46cb7b05
commit
f28b5a0ed8
3 changed files with 16 additions and 1 deletions
|
@ -70,10 +70,17 @@ def delegate_tox(args, exclude, require):
|
|||
|
||||
options = {
|
||||
'--tox': args.tox_args,
|
||||
'--tox-sitepackages': 0,
|
||||
}
|
||||
|
||||
for version in versions:
|
||||
tox = ['tox', '-c', 'test/runner/tox.ini', '-e', 'py' + version.replace('.', ''), '--']
|
||||
tox = ['tox', '-c', 'test/runner/tox.ini', '-e', 'py' + version.replace('.', '')]
|
||||
|
||||
if args.tox_sitepackages:
|
||||
tox.append('--sitepackages')
|
||||
|
||||
tox.append('--')
|
||||
|
||||
cmd = generate_command(args, os.path.abspath('test/runner/test.py'), options, exclude, require)
|
||||
|
||||
if not args.python:
|
||||
|
|
|
@ -1104,6 +1104,8 @@ class EnvironmentConfig(CommonConfig):
|
|||
self.docker_privileged = args.docker_privileged if 'docker_privileged' in args else False # type: bool
|
||||
self.docker_util = docker_qualify_image(args.docker_util if 'docker_util' in args else None) # type: str | None
|
||||
|
||||
self.tox_sitepackages = args.tox_sitepackages # type: bool
|
||||
|
||||
self.remote_stage = args.remote_stage # type: str
|
||||
|
||||
self.requirements = args.requirements # type: bool
|
||||
|
|
|
@ -387,6 +387,12 @@ def add_environments(parser, tox_version=False, tox_only=False):
|
|||
action='store_true',
|
||||
help='run from a tox virtualenv')
|
||||
|
||||
tox = parser.add_argument_group(title='tox arguments')
|
||||
|
||||
tox.add_argument('--tox-sitepackages',
|
||||
action='store_true',
|
||||
help='allow access to globally installed packages')
|
||||
|
||||
if tox_only:
|
||||
environments.set_defaults(
|
||||
docker=None,
|
||||
|
|
Loading…
Reference in a new issue