tests: move tests to testsuite.helpers.progress_test

This commit is contained in:
Thomas Waldmann 2025-05-21 20:20:33 +02:00
parent 8458ed1965
commit 6ff557c6eb
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
2 changed files with 47 additions and 47 deletions

View file

@ -0,0 +1,47 @@
from ...helpers.progress import ProgressIndicatorPercent
def test_progress_percentage(capfd):
pi = ProgressIndicatorPercent(1000, step=5, start=0, msg="%3.0f%%")
pi.logger.setLevel("INFO")
pi.show(0)
out, err = capfd.readouterr()
assert err == " 0%\n"
pi.show(420)
pi.show(680)
out, err = capfd.readouterr()
assert err == " 42%\n 68%\n"
pi.show(1000)
out, err = capfd.readouterr()
assert err == "100%\n"
pi.finish()
out, err = capfd.readouterr()
assert err == "\n"
def test_progress_percentage_step(capfd):
pi = ProgressIndicatorPercent(100, step=2, start=0, msg="%3.0f%%")
pi.logger.setLevel("INFO")
pi.show()
out, err = capfd.readouterr()
assert err == " 0%\n"
pi.show()
out, err = capfd.readouterr()
assert err == "" # no output at 1% as we have step == 2
pi.show()
out, err = capfd.readouterr()
assert err == " 2%\n"
def test_progress_percentage_quiet(capfd):
pi = ProgressIndicatorPercent(1000, step=5, start=0, msg="%3.0f%%")
pi.logger.setLevel("WARN")
pi.show(0)
out, err = capfd.readouterr()
assert err == ""
pi.show(1000)
out, err = capfd.readouterr()
assert err == ""
pi.finish()
out, err = capfd.readouterr()
assert err == ""

View file

@ -10,7 +10,6 @@ import pytest
from ..archiver.prune_cmd import prune_split
from ..constants import * # NOQA
from ..helpers import ChunkIteratorFileWrapper, ChunkerParams
from ..helpers import ProgressIndicatorPercent
from ..helpers import chunkit
from ..helpers import safe_ns, safe_s, SUPPORT_32BIT_PLATFORMS
from ..helpers import popen_with_error_handling
@ -192,52 +191,6 @@ def test_is_slow_msgpack():
assert not is_slow_msgpack()
def test_progress_percentage(capfd):
pi = ProgressIndicatorPercent(1000, step=5, start=0, msg="%3.0f%%")
pi.logger.setLevel("INFO")
pi.show(0)
out, err = capfd.readouterr()
assert err == " 0%\n"
pi.show(420)
pi.show(680)
out, err = capfd.readouterr()
assert err == " 42%\n 68%\n"
pi.show(1000)
out, err = capfd.readouterr()
assert err == "100%\n"
pi.finish()
out, err = capfd.readouterr()
assert err == "\n"
def test_progress_percentage_step(capfd):
pi = ProgressIndicatorPercent(100, step=2, start=0, msg="%3.0f%%")
pi.logger.setLevel("INFO")
pi.show()
out, err = capfd.readouterr()
assert err == " 0%\n"
pi.show()
out, err = capfd.readouterr()
assert err == "" # no output at 1% as we have step == 2
pi.show()
out, err = capfd.readouterr()
assert err == " 2%\n"
def test_progress_percentage_quiet(capfd):
pi = ProgressIndicatorPercent(1000, step=5, start=0, msg="%3.0f%%")
pi.logger.setLevel("WARN")
pi.show(0)
out, err = capfd.readouterr()
assert err == ""
pi.show(1000)
out, err = capfd.readouterr()
assert err == ""
pi.finish()
out, err = capfd.readouterr()
assert err == ""
def test_chunk_file_wrapper():
cfw = ChunkIteratorFileWrapper(iter([b"abc", b"def"]))
assert cfw.read(2) == b"ab"