Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/544.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed the progress bar remaining-time placeholder to account for uncompleted steps.
2 changes: 1 addition & 1 deletion src/cleo/ui/progress_bar.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ def _formatter_remaining(self) -> str:
remaining = 0
else:
remaining = round(
(time.time() - self._start_time) / self._step * (self._max - self._max)
(time.time() - self._start_time) / self._step * (self._max - self._step)
)

return format_time(remaining)
Expand Down
10 changes: 10 additions & 0 deletions tests/ui/test_progress_bar.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations

from typing import TYPE_CHECKING
from unittest.mock import patch

import pytest

Expand Down Expand Up @@ -225,6 +226,15 @@ def test_percent(ansi_io: BufferedIO) -> None:
assert expected == ansi_io.fetch_error()


def test_remaining_time_uses_uncompleted_steps(ansi_io: BufferedIO) -> None:
with patch("cleo.ui.progress_bar.time.time", return_value=10):
bar = ProgressBar(ansi_io, max=10, min_seconds_between_redraws=0)
bar._start_time = 0
bar._step = 2

assert bar._formatter_remaining() == "40 secs"


def test_overwrite_with_shorter_line(ansi_io: BufferedIO) -> None:
bar = ProgressBar(ansi_io, 50, 0)
bar.set_format(" %current%/%max% [%bar%] %percent:3s%%")
Expand Down