Merge pull request #2580 from aws/revert-2578-use-python-m-test

Revert "Use python -m to test CLI"

Author: kyleknap

awscli/argparser.py

@@ -142,13 +142,12 @@ def _build(self, command_table, version_string, argument_table):
 
 class ServiceArgParser(CLIArgParser):
 
-    def __init__(self, operations_table, service_name, prog=None):
+    def __init__(self, operations_table, service_name):
         super(ServiceArgParser, self).__init__(
             formatter_class=argparse.RawTextHelpFormatter,
             add_help=False,
             conflict_handler='resolve',
-            usage=USAGE,
-            prog=prog)
+            usage=USAGE)
         self._build(operations_table)
         self._service_name = service_name
 
@@ -160,16 +159,15 @@ def _build(self, operations_table):
 class ArgTableArgParser(CLIArgParser):
     """CLI arg parser based on an argument table."""
 
-    def __init__(self, argument_table, command_table=None, prog=None):
+    def __init__(self, argument_table, command_table=None):
         # command_table is an optional subcommand_table.  If it's passed
         # in, then we'll update the argparse to parse a 'subcommand' argument
         # and populate the choices field with the command table keys.
         super(ArgTableArgParser, self).__init__(
             formatter_class=self.Formatter,
             add_help=False,
             usage=USAGE,
-            conflict_handler='resolve',
-            prog=prog)
+            conflict_handler='resolve')
         if command_table is None:
             command_table = {}
         self._build(argument_table, command_table)

awscli/clidriver.py

@@ -376,8 +376,7 @@ def _create_parser(self):
         # Also add a 'help' command.
         command_table['help'] = self.create_help_command()
         return ServiceArgParser(
-            operations_table=command_table, service_name=self._name,
-            prog="aws")
+            operations_table=command_table, service_name=self._name)
 
 
 class ServiceOperation(object):
@@ -585,7 +584,7 @@ def _emit_first_non_none_response(self, name, **kwargs):
             name, **kwargs)
 
     def _create_operation_parser(self, arg_table):
-        parser = ArgTableArgParser(arg_table, prog="aws")
+        parser = ArgTableArgParser(arg_table)
         return parser
 
 

awscli/customizations/commands.py

@@ -135,8 +135,7 @@ def __call__(self, args, parsed_globals):
             ".".join(self.lineage_names)
         self._session.emit(event, argument_table=self._arg_table, args=args,
                            session=self._session)
-        parser = ArgTableArgParser(self.arg_table, self.subcommand_table,
-                                   prog="aws")
+        parser = ArgTableArgParser(self.arg_table, self.subcommand_table)
         parsed_args, remaining = parser.parse_known_args(args)
 
         # Unpack arguments

awscli/help.py

@@ -258,8 +258,7 @@ def related_items(self):
 
     def __call__(self, args, parsed_globals):
         if args:
-            subcommand_parser = ArgTableArgParser({}, self.subcommand_table,
-                                                  prog="aws")
+            subcommand_parser = ArgTableArgParser({}, self.subcommand_table)
             parsed, remaining = subcommand_parser.parse_known_args(args)
             if getattr(parsed, 'subcommand', None) is not None:
                 return self.subcommand_table[parsed.subcommand](remaining,

awscli/testutils.py

@@ -23,11 +23,13 @@
 import sys
 import copy
 import shutil
+import time
 import json
 import logging
 import tempfile
 import platform
 import contextlib
+import string
 import binascii
 from pprint import pformat
 from subprocess import Popen, PIPE
@@ -118,6 +120,37 @@ def create_clidriver():
     return driver
 
 
+def get_aws_cmd():
+    global AWS_CMD
+    import awscli
+    if AWS_CMD is None:
+        # Try <repo>/bin/aws
+        repo_root = os.path.dirname(os.path.abspath(awscli.__file__))
+        aws_cmd = os.path.join(repo_root, 'bin', 'aws')
+        if not os.path.isfile(aws_cmd):
+            aws_cmd = _search_path_for_cmd('aws')
+            if aws_cmd is None:
+                raise ValueError('Could not find "aws" executable.  Either '
+                                 'make sure it is on your PATH, or you can '
+                                 'explicitly set this value using '
+                                 '"set_aws_cmd()"')
+        AWS_CMD = aws_cmd
+    return AWS_CMD
+
+
+def _search_path_for_cmd(cmd_name):
+    for path in os.environ.get('PATH', '').split(os.pathsep):
+        full_cmd_path = os.path.join(path, cmd_name)
+        if os.path.isfile(full_cmd_path):
+            return full_cmd_path
+    return None
+
+
+def set_aws_cmd(aws_cmd):
+    global AWS_CMD
+    AWS_CMD = aws_cmd
+
+
 @contextlib.contextmanager
 def temporary_file(mode):
     """This is a cross platform temporary file creation.
@@ -606,8 +639,11 @@ def aws(command, collect_memory=False, env_vars=None,
     """
     if platform.system() == 'Windows':
         command = _escape_quotes(command)
-    module = "awscli" if sys.version_info[:2] >= (2, 7) else "awscli.__main__"
-    full_command = '%s -m %s %s' % (sys.executable, module, command)
+    if 'AWS_TEST_COMMAND' in os.environ:
+        aws_command = os.environ['AWS_TEST_COMMAND']
+    else:
+        aws_command = 'python %s' % get_aws_cmd()
+    full_command = '%s %s' % (aws_command, command)
     stdout_encoding = get_stdout_encoding()
     if isinstance(full_command, six.text_type) and not six.PY3:
         full_command = full_command.encode(stdout_encoding)