From 97a0810e0ff45a15dfc459367aeb415c0b5e7ad5 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 8 Aug 2019 09:18:31 -0700 Subject: [PATCH] Move ansible-test entry point. (#60281) --- bin/ansible-test | 22 +-------------- .../_data/cli/ansible_test_cli_stub.py | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 21 deletions(-) mode change 100755 => 120000 bin/ansible-test create mode 100755 test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py diff --git a/bin/ansible-test b/bin/ansible-test deleted file mode 100755 index c7ea914c69..0000000000 --- a/bin/ansible-test +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python -# PYTHON_ARGCOMPLETE_OK -"""Command line entry point for ansible-test.""" - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - -import os -import sys - -if __name__ == '__main__': - ansible_root = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)))) - source_root = os.path.join(ansible_root, 'test', 'lib') - - if os.path.exists(os.path.join(ansible_root, 'setup.py')) and os.path.exists(os.path.join(source_root, 'ansible_test', '_internal', 'cli.py')): - # running from source, use that version of ansible-test instead of any version that may already be installed - sys.path.insert(0, source_root) - - from ansible_test._internal.cli import main - - main() diff --git a/bin/ansible-test b/bin/ansible-test new file mode 120000 index 0000000000..14f009af86 --- /dev/null +++ b/bin/ansible-test @@ -0,0 +1 @@ +../test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py \ No newline at end of file diff --git a/test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py b/test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py new file mode 100755 index 0000000000..4c075075f5 --- /dev/null +++ b/test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python +# PYTHON_ARGCOMPLETE_OK +"""Command line entry point for ansible-test.""" + +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + +import os +import sys + + +def main(): + """Main program entry point.""" + ansible_root = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)))) + source_root = os.path.join(ansible_root, 'test', 'lib') + + if os.path.exists(os.path.join(ansible_root, 'setup.py')) and os.path.exists(os.path.join(source_root, 'ansible_test', '_internal', 'cli.py')): + # running from source, use that version of ansible-test instead of any version that may already be installed + sys.path.insert(0, source_root) + + from ansible_test._internal.cli import main as cli_main + + cli_main() + + +if __name__ == '__main__': + main()