Bug 1571684 - [mozlint] Stop logging Android lint setup failures, r=linter-reviewers,sylvestre

Differential Revision: https://phabricator.services.mozilla.com/D236223

Author: ahal

python/mozlint/mozlint/result.py

@@ -29,6 +29,7 @@ def reset(self):
         self.issues = defaultdict(list)
         self.failed_run = set()
         self.failed_setup = set()
+        self.skipped = set()
         self.suppressed_warnings = defaultdict(int)
         self.fixed = 0
 
@@ -71,6 +72,7 @@ def update(self, other):
 
         self.failed_run |= other.failed_run
         self.failed_setup |= other.failed_setup
+        self.skipped |= other.skipped
         self.fixed += other.fixed
         for k, v in other.suppressed_warnings.items():
             self.suppressed_warnings[k] += v

python/mozlint/mozlint/roller.py

@@ -231,8 +231,11 @@ def setup(self, virtualenv_manager=None):
                 if virtualenv_manager is not None:
                     setupargs["virtualenv_manager"] = virtualenv_manager
                 start_time = time.monotonic()
-                res = findobject(linter["setup"])(
-                    **setupargs,
+                res = (
+                    findobject(linter["setup"])(
+                        **setupargs,
+                    )
+                    or 0
                 )
                 self.log.debug(
                     f"setup for {linter['name']} finished in "
@@ -242,18 +245,22 @@ def setup(self, virtualenv_manager=None):
                 traceback.print_exc()
                 res = 1
 
-            if res:
+            if res > 0:
                 self.result.failed_setup.add(linter["name"])
+                self.result.skipped.add(linter["name"])
+            elif res < 0:
+                # Negative return code means the linter should be skipped for
+                # reasons other than a failure.
+                self.result.skipped.add(linter["name"])
+
+        self.linters = [l for l in self.linters if l["name"] not in self.result.skipped]
 
         if self.result.failed_setup:
             print(
                 "error: problem with lint setup, skipping {}".format(
                     ", ".join(sorted(self.result.failed_setup))
                 )
             )
-            self.linters = [
-                l for l in self.linters if l["name"] not in self.result.failed_setup
-            ]
             return 1
         return 0
 

tools/lint/android/lints.py

@@ -31,15 +31,13 @@
 
 def setup(root, **setupargs):
     if setupargs.get("substs", {}).get("MOZ_BUILD_APP") != "mobile/android":
-        return 1
+        return -1
 
     if "topobjdir" not in setupargs:
-        print(
-            "Skipping {}: a configured Android build is required!".format(
-                setupargs["name"]
-            )
+        setupargs["log"].debug(
+            f"Skipping {setupargs['name']}: a configured Android build is required!"
         )
-        return 1
+        return -1
 
     return 0