test: simplify skipper, and make it suppressable

Author: nedbat

igor.py

@@ -38,8 +38,8 @@
 PYPY = platform.python_implementation() == "PyPy"
 
 
-# $set_env.py: COVERAGE_IGOR_VERBOSE - More output from igor.py
-VERBOSITY = int(os.getenv("COVERAGE_IGOR_VERBOSE", "0"))
+# $set_env.py: COVERAGE_IGOR_VERBOSE - How much chatter from igor.py (default 1)
+VERBOSITY = int(os.getenv("COVERAGE_IGOR_VERBOSE", "1"))
 
 # Functions named do_* are executable from the command line: do_blah is run
 # by "python igor.py blah".
@@ -87,16 +87,16 @@ def do_remove_extension(*args):
 
     for root, pattern in itertools.product(roots, so_patterns):
         pattern = os.path.join(root, pattern)
-        if VERBOSITY:
+        if VERBOSITY > 1:
             print(f"Searching for {pattern} from {os.getcwd()}")
         for filename in glob.glob(pattern):
             if os.path.exists(filename):
-                if VERBOSITY:
+                if VERBOSITY > 1:
                     print(f"Removing {os.path.abspath(filename)}")
                 try:
                     os.remove(filename)
                 except OSError as exc:
-                    if VERBOSITY:
+                    if VERBOSITY > 1:
                         print(f"Couldn't remove {os.path.abspath(filename)}: {exc}")
 
 
@@ -140,13 +140,9 @@ def should_skip(core):
                     skipper = f"No C core for {platform.python_implementation()}"
 
     if skipper:
-        msg = "Skipping tests " + label_for_core(core)
-        if len(skipper) > 1:
-            msg += ": " + skipper
+        return f"Skipping tests {label_for_core(core)}: {skipper}"
     else:
-        msg = ""
-
-    return msg
+        return ""
 
 
 def make_env_id(core):
@@ -253,7 +249,8 @@ def do_test_with_core(core, *runner_args):
     # If we should skip these tests, skip them.
     skip_msg = should_skip(core)
     if skip_msg:
-        print(skip_msg)
+        if VERBOSITY > 0:
+            print(skip_msg)
         return None
 
     os.environ["COVERAGE_CORE"] = core