Bug 1681096 - python3 - pylint --py3k - W1633: round built-in referenced (round-builtin) r=marionette-reviewers,perftest-reviewers,aki,gbrown,whimboo

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

Author: Bob Clary

testing/marionette/client/marionette_driver/wait.py

@@ -154,8 +154,9 @@ def until(self, condition, is_true=None, message=""):
             message = " with message: {}".format(message)
 
         raise errors.TimeoutException(
+            # pylint: disable=W1633
             "Timed out after {0:.1f} seconds{1}".format(
-                round((self.clock.now - start), 1), message if message else ""
+                float(round((self.clock.now - start), 1)), message if message else ""
             ),
             cause=last_exc,
         )

testing/mozbase/manifestparser/manifestparser/filters.py

@@ -206,6 +206,7 @@ def __call__(self, tests, values):
             chunk_tests = [t for t in tests if "disabled" not in t]
 
         tests_per_chunk = float(len(chunk_tests)) / self.total_chunks
+        # pylint: disable=W1633
         start = int(round((self.this_chunk - 1) * tests_per_chunk))
         end = int(round(self.this_chunk * tests_per_chunk))
 
@@ -268,6 +269,7 @@ def __call__(self, tests, values):
                 ordered_dirs.append(path)
             tests_by_dir[path].append(test)
 
+        # pylint: disable=W1633
         tests_per_chunk = float(len(ordered_dirs)) / self.total_chunks
         start = int(round((self.this_chunk - 1) * tests_per_chunk))
         end = int(round(self.this_chunk * tests_per_chunk))
@@ -363,6 +365,7 @@ def get_chunked_manifests(self, manifests):
         # Compute the average to use as a default for manifests that don't exist.
         times = [r[0] for r in runtimes]
         # pylint --py3k W1619
+        # pylint: disable=W1633
         avg = round(sum(times) / len(times), 2) if times else 0
         missing = sorted([m for m in manifests if m not in self.runtimes])
         log(
@@ -394,6 +397,7 @@ def __call__(self, tests, values):
         chunks = self.get_chunked_manifests(manifests)
         runtime, this_manifests = chunks[self.this_chunk - 1]
         # pylint --py3k W1619
+        # pylint: disable=W1633
         log(
             "Cumulative test runtime is around {} minutes (average is {} minutes)".format(
                 round(runtime / 60),

testing/mozbase/mozlog/mozlog/scripts/logmerge.py

@@ -19,6 +19,7 @@ def dump_entry(entry, output):
 
 
 def fill_process_info(event):
+    # pylint: disable=W1633
     event["time"] = int(round(time.time() * 1000))
     event["thread"] = current_thread().name
     event["pid"] = os.getpid()

testing/mozbase/mozlog/mozlog/unstructured/logger.py

@@ -105,6 +105,7 @@ class JSONFormatter(Formatter):
 
     def format(self, record):
         # Default values determined by logger metadata
+        # pylint: disable=W1633
         output = {
             "_time": int(round(record.created * 1000, 0)),
             "_namespace": record.name,

testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/inject-deterministic.py

@@ -111,6 +111,7 @@ def get_new_csp_header(self, headers, updated_csp_script):
 
     def response(self, flow):
 
+        # pylint: disable=W1633
         millis = int(round(time.time() * 1000))
 
         if "content-type" in flow.response.headers:

testing/mozharness/mozharness/base/python.py

@@ -702,6 +702,7 @@ def log_usage(prefix, duration, cpu_percent, cpu_times, io):
             # being fed into a 'f' formatter. This will help diagnose the
             # issue.
             if cpu_percent:
+                # pylint: disable=W1633
                 cpu_percent_str = str(round(cpu_percent)) + "%"
             else:
                 cpu_percent_str = "Can't collect data"

testing/raptor/raptor/output.py

@@ -391,6 +391,7 @@ def _filter(vals, value=None):
             return filters.mean(_filter(vals, "Geometric Mean"))
 
         if testname.startswith("raptor-assorted-dom"):
+            # pylint: disable=W1633
             return round(filters.geometric_mean(_filter(vals)), 2)
 
         if testname.startswith("raptor-wasm-misc"):
@@ -402,6 +403,7 @@ def _filter(vals, value=None):
             return filters.mean(_filter(vals, "first-interactive"))
 
         if testname.startswith("raptor-youtube-playback"):
+            # pylint: disable=W1633
             return round(filters.mean(_filter(vals)), 2)
 
         if testname.startswith("supporting_data"):
@@ -431,8 +433,10 @@ def _filter(vals, value=None):
             raise NotImplementedError("Unit %s not suported" % unit)
 
         if len(vals) > 1:
+            # pylint: disable=W1633
             return round(filters.geometric_mean(_filter(vals)), 2)
 
+        # pylint: disable=W1633
         return round(filters.mean(_filter(vals)), 2)
 
     def parseSpeedometerOutput(self, test):
@@ -467,6 +471,7 @@ def parseSpeedometerOutput(self, test):
                         "name": sub,
                         "replicates": [],
                     }
+                # pylint: disable=W1633
                 _subtests[sub]["replicates"].extend([round(x, 3) for x in replicates])
 
         vals = []
@@ -574,7 +579,10 @@ def parseAresSixOutput(self, test):
                         "name": sub,
                         "replicates": [],
                     }
-                _subtests[sub]["replicates"].extend([round(x, 3) for x in replicates])
+                # pylint: disable=W1633
+                _subtests[sub]["replicates"].extend(
+                    [float(round(x, 3)) for x in replicates]
+                )
 
         vals = []
         for name, test in _subtests.items():
@@ -680,8 +688,9 @@ def create_subtest_entry(
         names = list(_subtests)
         names.sort(reverse=True)
         for name in names:
+            # pylint: disable=W1633
             _subtests[name]["value"] = round(
-                filters.median(_subtests[name]["replicates"]), 2
+                float(filters.median(_subtests[name]["replicates"])), 2
             )
             subtests.append(_subtests[name])
             # only include dropped_frames values, without the %_dropped_frames values
@@ -1051,7 +1060,10 @@ def parseJetstreamTwoOutput(self, test):
                         "name": sub,
                         "replicates": [],
                     }
-                _subtests[sub]["replicates"].extend([round(x, 3) for x in replicates])
+                # pylint: disable=W1633
+                _subtests[sub]["replicates"].extend(
+                    [float(round(x, 3)) for x in replicates]
+                )
 
         vals = []
         subtests = []
@@ -1180,7 +1192,10 @@ def parseWebaudioOutput(self, test):
                         "name": sub,
                         "replicates": [],
                     }
-                _subtests[sub]["replicates"].extend([round(x, 3) for x in replicates])
+                # pylint: disable=W1633
+                _subtests[sub]["replicates"].extend(
+                    [float(round(x, 3)) for x in replicates]
+                )
 
         vals = []
         subtests = []
@@ -1227,6 +1242,7 @@ def parseMotionmarkOutput(self, test):
             suite = list(page_cycle_results)[0]
             for sub in page_cycle_results[suite].keys():
                 try:
+                    # pylint: disable=W1633
                     replicate = round(
                         float(page_cycle_results[suite][sub]["frameLength"]["average"]),
                         3,
@@ -1273,7 +1289,10 @@ def parseSunspiderOutput(self, test):
                         "name": sub,
                         "replicates": [],
                     }
-                _subtests[sub]["replicates"].extend([round(x, 3) for x in replicates])
+                # pylint: disable=W1633
+                _subtests[sub]["replicates"].extend(
+                    [float(round(x, 3)) for x in replicates]
+                )
 
         subtests = []
         vals = []
@@ -1323,8 +1342,9 @@ def parseAssortedDomOutput(self, test):
         names = list(_subtests)
         names.sort(reverse=True)
         for name in names:
-            _subtests[name]["value"] = round(
-                filters.median(_subtests[name]["replicates"]), 2
+            # pylint: disable=W1633
+            _subtests[name]["value"] = float(
+                round(filters.median(_subtests[name]["replicates"]), 2)
             )
             subtests.append(_subtests[name])
             # only use the 'total's to compute the overall result

testing/talos/talos/run_tests.py

@@ -457,7 +457,8 @@ def make_comparison_result(base_and_reference_results):
         _index = 0
         for next_ref in comp_results[subtest_index]["ref_runs"]:
             diff = abs(next_ref - comp_results[subtest_index]["base_runs"][_index])
-            comp_results[subtest_index]["runs"].append(round(diff, 3))
+            # pylint: disable=W1633
+            comp_results[subtest_index]["runs"].append(float(round(diff, 3)))
             _index += 1
 
         # increment our base vs reference subtest index

testing/testinfo.py

@@ -671,7 +671,7 @@ def update_item(item, label, value):
             if type(new_value) == int:
                 item[label] = new_value
             else:
-                item[label] = round(new_value, 2)
+                item[label] = float(round(new_value, 2))  # pylint: disable=W1633
 
         if "test" in result and "tests" in by_component:
             test = result["test"]
@@ -680,7 +680,8 @@ def update_item(item, label, value):
             for bc in by_component["tests"]:
                 for item in by_component["tests"][bc]:
                     if test == item["test"]:
-                        seconds = round(result.get("duration", 0), 2)
+                        # pylint: disable=W1633
+                        seconds = float(round(result.get("duration", 0), 2))
                         update_item(item, "total run time, seconds", seconds)
                         update_item(item, "total runs", result.get("count", 0))
                         update_item(item, "skipped runs", result.get("skips", 0))