Running tmt clean will now show disk space freed

tests/clean/runs/test.sh

@@ -22,6 +22,7 @@ rlJournalStart
         rlRun -s "tmt clean runs --dry -v --workdir-root $tmprun"
         rlAssertGrep "Would remove workdir '$run1'" "$rlRun_LOG"
         rlAssertGrep "Would remove workdir '$run2'" "$rlRun_LOG"
+        rlAssertGrep "Summary: Would free.*of disk space" "$rlRun_LOG"
         rlRun -s "tmt status --workdir-root $tmprun -vv"
         rlAssertGrep "(done\s+){1}(todo\s+){6}$run1\s+/plan1" "$rlRun_LOG" -E
         rlAssertGrep "(done\s+){1}(todo\s+){6}$run2\s+/plan1" "$rlRun_LOG" -E
@@ -30,12 +31,14 @@ rlJournalStart
     rlPhaseStartTest "Specify ID"
         rlRun -s "tmt clean runs -v -i $run1"
         rlAssertGrep "Removing workdir '$run1'" "$rlRun_LOG"
+        rlAssertGrep "Summary: Freed.*of disk space" "$rlRun_LOG"
         rlRun -s "tmt status --workdir-root $tmprun -vv"
         rlAssertNotGrep "(done\s+){1}(todo\s+){6}$run1\s+/plan1" "$rlRun_LOG" -E
         rlAssertGrep "(done\s+){1}(todo\s+){6}$run2\s+/plan1" "$rlRun_LOG" -E
 
         rlRun -s "tmt clean runs -v -l --workdir-root $tmprun"
         rlAssertGrep "Removing workdir '$run2'" "$rlRun_LOG"
+        rlAssertGrep "Summary: Freed.*of disk space" "$rlRun_LOG"
         rlRun -s "tmt status --workdir-root $tmprun -vv"
         rlAssertNotGrep "(done\s+){1}(todo\s+){6}$run2\s+/plan1" "$rlRun_LOG" -E
 

tmt/base/core.py

@@ -3613,6 +3613,11 @@ def show(self) -> None:
 CleanCallback = Callable[[], bool]
 
 
+def _dir_size(path: Path) -> int:
+    """Return the total size in bytes of all files under path."""
+    return sum(f.stat().st_size for f in path.rglob('*') if f.is_file())
+
+
 class Clean(tmt.utils.Common):
     """
     A class for cleaning up workdirs, guests or images
@@ -3751,14 +3756,15 @@ def guests(self, run_ids: tuple[str, ...], keep: Optional[int]) -> bool:
                 successful = False
         return successful
 
-    def _clean_workdir(self, path: Path) -> bool:
+    def _clean_workdir(self, path: Path, size: int) -> bool:
         """
         Remove a workdir (unless in dry mode)
         """
+        formatted_size = tmt.utils.format_size(size)
         if self.is_dry_run:
-            self.verbose(f"Would remove workdir '{path}'.", shift=1)
+            self.verbose(f"Would remove workdir '{path}' ({formatted_size}).", shift=1)
         else:
-            self.verbose(f"Removing workdir '{path}'.", shift=1)
+            self.verbose(f"Removing workdir '{path}' ({formatted_size}).", shift=1)
             try:
                 shutil.rmtree(path)
             except OSError as error:
@@ -3777,18 +3783,33 @@ def runs(self, id_: tuple[str, ...], keep: Optional[int]) -> bool:
             # the correct one.
             last_run = Run(logger=self._logger, cli_invocation=self.cli_invocation)
             last_run.load_workdir(with_logfiles=False)
-            return self._clean_workdir(last_run.run_workdir)
+            size = _dir_size(last_run.run_workdir)
+            success = self._clean_workdir(last_run.run_workdir, size)
+            self.verbose(
+                f"Summary: {'Would free' if self.is_dry_run else 'Freed'} "
+                f"{tmt.utils.format_size(size)} of disk space.",
+                shift=1,
+            )
+            return success
         all_workdirs = list(tmt.utils.generate_runs(self.workdir_root, id_, all_=True))
         if keep is not None:
             # Sort by change time of the workdirs and keep the newest workdirs
             all_workdirs.sort(key=lambda workdir: workdir.stat().st_ctime, reverse=True)
             all_workdirs = all_workdirs[keep:]
 
         successful = True
+        total_size = 0
         for workdir in all_workdirs:
-            if not self._clean_workdir(workdir):
+            size = _dir_size(workdir)
+            total_size += size
+            if not self._clean_workdir(workdir, size):
                 successful = False
 
+        self.verbose(
+            f"Summary: {'Would free' if self.is_dry_run else 'Freed'} "
+            f"{tmt.utils.format_size(total_size)} of disk space.",
+            shift=1,
+        )
         return successful
 
 

tmt/steps/provision/testcloud.py

@@ -1589,16 +1589,25 @@ def clean_images(cls, clean: 'tmt.base.core.Clean', dry: bool, workdir_root: Pat
             clean.warn(f"Directory '{testcloud_images}' does not exist.", shift=2)
             return True
         successful = True
+        total_size = 0
         for image in testcloud_images.iterdir():
+            size = image.stat().st_size
+            total_size += size
+            formatted_size = tmt.utils.format_size(size)
             if dry:
-                clean.verbose(f"Would remove '{image}'.", shift=2)
+                clean.verbose(f"Would remove '{image}' ({formatted_size}).", shift=2)
             else:
-                clean.verbose(f"Removing '{image}'.", shift=2)
+                clean.verbose(f"Removing '{image}' ({formatted_size}).", shift=2)
                 try:
                     image.unlink()
                 except OSError:
                     clean.fail(f"Failed to remove '{image}'.", shift=2)
                     successful = False
+        clean.verbose(
+            f"Summary: {'Would free' if dry else 'Freed'} "
+            f"{tmt.utils.format_size(total_size)} of disk space.",
+            shift=2,
+        )
         return successful
 
 

tmt/utils/__init__.py

@@ -86,6 +86,15 @@
     from tmt.hardware import Size
 
 
+def format_size(size: int) -> str:
+    """Format a byte count into a human-readable string."""
+    for unit in ('B', 'KB', 'MB', 'GB', 'TB'):
+        if size < 1024:
+            return f'{size:.1f} {unit}'
+        size = int(size / 1024)
+    return f'{size:.1f} PB'
+
+
 def sanitize_string(text: str) -> str:
     """Remove invalid Unicode characters from a string"""
     try: