WIP

Author: nicoddemus

src/_pytest/fixtures.py

@@ -698,7 +698,9 @@ def scope2index(scope, descr, where=None):
     try:
         return scopes.index(scope)
     except ValueError:
-        raise ValueError(
+        from _pytest.config import UsageError
+
+        raise UsageError(
             "{} {}has an unsupported scope value '{}'".format(
                 descr, "from {} ".format(where) if where else "", scope
             )

src/_pytest/runner.py

@@ -227,13 +227,18 @@ def pytest_runtest_makereport(item, call):
         outcome = "passed"
         longrepr = None
     else:
+        from _pytest.config import UsageError
+
         if not isinstance(excinfo, ExceptionInfo):
             outcome = "failed"
             longrepr = excinfo
         elif excinfo.errisinstance(skip.Exception):
             outcome = "skipped"
             r = excinfo._getreprcrash()
             longrepr = (str(r.path), r.lineno, r.message)
+        elif excinfo.errisinstance(UsageError) and item.config.getoption("verbose") < 2:
+            outcome = "failed"
+            longrepr = six.text_type(excinfo.value)
         else:
             outcome = "failed"
             if call.when == "call":
@@ -264,9 +269,16 @@ def pytest_make_collect_report(collector):
         outcome = "passed"
     else:
         from _pytest import nose
+        from _pytest.config import UsageError
 
         skip_exceptions = (Skipped,) + nose.get_skip_exceptions()
-        if call.excinfo.errisinstance(skip_exceptions):
+        if (
+            call.excinfo.errisinstance(UsageError)
+            and collector.config.getoption("verbose") < 2
+        ):
+            outcome = "failed"
+            longrepr = six.text_type(call.excinfo.value)
+        elif call.excinfo.errisinstance(skip_exceptions):
             outcome = "skipped"
             r = collector._repr_failure_py(call.excinfo, "line").reprcrash
             longrepr = (str(r.path), r.lineno, r.message)