Python code fixes

pythonFiles/testing_tools/adapter/__main__.py

@@ -40,31 +40,31 @@ def parse_args(
     # Add "run" and "debug" subcommands when ready.
     for cmdname in ['discover']:
         sub = cmdsubs.add_parser(cmdname)
-        if cmdname == 'discover':
-            sub.add_argument('--simple', action='store_true')
-            sub.add_argument('--show-pytest', action='store_true')
         subsubs = sub.add_subparsers(dest='tool')
         for toolname in sorted(TOOLS):
             try:
                 add_subparser = TOOLS[toolname]['_add_subparser']
             except KeyError:
                 continue
-            add_subparser(cmdname, toolname, subsubs)
+            subsub = add_subparser(cmdname, toolname, subsubs)
+            if cmdname == 'discover':
+                subsub.add_argument('--simple', action='store_true')
+                subsub.add_argument('--show-' + toolname, action='store_true')
+                subsub.add_argument('--pretty', action='store_true')
 
     # Parse the args!
-    args, toolargs = parser.parse_known_args(argv)
+    if '--' in argv:
+        seppos = argv.index('--')
+        toolargs = argv[seppos + 1:]
+        argv = argv[:seppos]
+    else:
+        toolargs = []
+    args = parser.parse_args(argv)
     ns = vars(args)
 
     cmd = ns.pop('cmd')
     if not cmd:
         parser.error('missing command')
-    if cmd == 'discover':
-        if '--simple' in toolargs:
-            toolargs.remove('--simple')
-            ns['simple'] = True
-        if '--show-pytest' in toolargs:
-            toolargs.remove('--show-pytest')
-            ns['show_pytest'] = True
 
     tool = ns.pop('tool')
     if not tool:
@@ -88,7 +88,6 @@ def main(toolname, cmdname, subargs, toolargs,
 
     parents, result = run(toolargs, **subargs)
     report_result(result, parents,
-                  debug=('-v' in toolargs or '--verbose' in toolargs),
                   **subargs
                   )
 

pythonFiles/testing_tools/adapter/pytest.py

@@ -7,6 +7,7 @@
 
 import pytest
 
+from . import util
 from .errors import UnsupportedCommandError
 from .info import TestInfo, TestPath, ParentInfo
 
@@ -23,13 +24,16 @@ def add_cli_subparser(cmd, name, parent):
 
 
 def discover(pytestargs=None, show_pytest=False,
-             _pytest_main=pytest.main, _plugin=None, **kwargs):
+             _pytest_main=pytest.main, _plugin=None, **_ignored):
     """Return the results of test discovery."""
     if _plugin is None:
         _plugin = TestCollector()
 
     pytestargs = _adjust_pytest_args(pytestargs, show_pytest=show_pytest)
-    ec = _pytest_main(pytestargs, [_plugin])
+    # We use this helper rather than "-pno:terminal" due to possible
+    # platform-dependent issues.
+    with util.hide_stdio() if not show_pytest else util.noop_cm():
+        ec = _pytest_main(pytestargs, [_plugin])
     if ec != 0:
         raise Exception('pytest discovery failed (exit code {})'.format(ec))
     if not _plugin._started:
@@ -49,8 +53,6 @@ def _adjust_pytest_args(pytestargs, show_pytest):
     pytestargs = list(pytestargs) if pytestargs else []
     # Duplicate entries should be okay.
     pytestargs.insert(0, '--collect-only')
-    if not show_pytest:
-        pytestargs.insert(0, '-pno:terminal')
     # TODO: pull in code from:
     #  src/client/unittests/pytest/services/discoveryService.ts
     #  src/client/unittests/pytest/services/argsService.ts

pythonFiles/testing_tools/adapter/report.py

@@ -6,8 +6,8 @@
 import json
 
 
-def report_discovered(tests, parents, debug=False, simple=False,
-                      _send=print, **kwargs):
+def report_discovered(tests, parents, pretty=False, simple=False,
+                      _send=print, **_ignored):
     """Serialize the discovered tests and write to stdout."""
     if simple:
         data = [{
@@ -62,7 +62,7 @@ def report_discovered(tests, parents, debug=False, simple=False,
             } for root in sorted(byroot)]
 
     kwargs = {}
-    if debug:
+    if pretty:
         # human-formatted
         kwargs = dict(
             sort_keys=True,

pythonFiles/testing_tools/adapter/util.py

@@ -0,0 +1,27 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import contextlib
+try:
+    from io import StringIO
+except ImportError:
+    from StringIO import StringIO  # 2.7
+import sys
+
+
+@contextlib.contextmanager
+def noop_cm():
+    yield
+
+
+@contextlib.contextmanager
+def hide_stdio():
+    """Swallow stdout and stderr."""
+    buf = StringIO()
+    sys.stdout = buf
+    sys.stderr = buf
+    try:
+        yield buf
+    finally:
+        sys.stdout = sys.__stdout__
+        sys.stderr = sys.__stderr__