diff options
-rw-r--r-- | lib/spack/spack/test/util/timer.py | 4 | ||||
-rw-r--r-- | lib/spack/spack/util/timer.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/spack/spack/test/util/timer.py b/lib/spack/spack/test/util/timer.py index 16c1564663..9f43526482 100644 --- a/lib/spack/spack/test/util/timer.py +++ b/lib/spack/spack/test/util/timer.py @@ -120,9 +120,9 @@ def test_timer_write(): output = text_buffer.getvalue().splitlines() assert "timer" in output[0] - assert "1.000s" in output[0] + assert "1.0000s" in output[0] assert "total" in output[1] - assert "3.000s" in output[1] + assert "3.0000s" in output[1] deserialized = json.loads(json_buffer.getvalue()) assert deserialized == { diff --git a/lib/spack/spack/util/timer.py b/lib/spack/spack/util/timer.py index 94b0531c16..83d6907c67 100644 --- a/lib/spack/spack/util/timer.py +++ b/lib/spack/spack/util/timer.py @@ -140,11 +140,11 @@ class Timer(object): def write_tty(self, out=sys.stdout): """Write a human-readable summary of timings""" # Individual timers ordered by registration - formatted = [(p, pretty_seconds(self.duration(p))) for p in self.phases] + formatted = [(p, f"{self.duration(p):.4f}s") for p in self.phases] # Total time - formatted.append(("total", pretty_seconds(self.duration()))) + formatted.append(("total", f"{self.duration():.4f}s")) # Write to out for name, duration in formatted: - out.write(" {:10s} {:>10s}\n".format(name, duration)) + out.write(f" {name:10s} {duration:>10s}\n") |