Moved CompletionIndex.load_completions call from init.

Moving this out is more modular, as CompletionIndex() is created in two places in the source: main and lexer (possible refactor TODO item).  It's also called once in the tests.  This change also simplifies testing as we can more easily substitute a mock function, although this could also probably be achieved with a mock side effect.

Author: donnemartin

awsshell/index/completion.py

@@ -49,7 +49,6 @@ def __init__(self, cache_dir=DEFAULT_CACHE_DIR, fslayer=None):
         self.subcommands = []
         self.global_opts = []
         self.args_opts = set()
-        self.load_completions()
 
     def load_index(self, version_string):
         """Load the completion index for a given CLI version.

awsshell/lexer.py

@@ -32,6 +32,7 @@ class ShellLexer(RegexLexer):
         pygments highlighting.
     """
     completion_index = CompletionIndex()
+    completion_index.load_completions()
     tokens = {
         'root': [
             # ec2, s3, elb...

tests/unit/test_load_completions.py

@@ -36,6 +36,7 @@ def setUp(self):
             '{"commands": [], "arguments": ["--baz"]}}}}}}'
         )
         self.completion_index.load_index = lambda x: DATA
+        self.completion_index.load_completions()
 
     def test_load_completions(self):
         assert self.completion_index.commands == [