From 6ec00474a659158f20248d6af3771d1a12ddac7b Mon Sep 17 00:00:00 2001 From: Toshiki Sonoda Date: Wed, 9 Nov 2022 18:33:57 +0900 Subject: virtinstall: Hide total_size in the progress bar if it doesn't need virt-install prints the total_size value to the progress bar even if it is meaningless. This value can be confusing to user, so for execute prosess that doesn't copy files (total_size = 0B), we hide the total_size value. For example, 'Creating domain...' doesn't need to print the total_size value. Signed-off-by: Toshiki Sonoda Signed-off-by: Haruka Ohata --- tests/data/meter/meter-zero.txt | 4 ++++ tests/test_misc.py | 14 ++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 tests/data/meter/meter-zero.txt (limited to 'tests') diff --git a/tests/data/meter/meter-zero.txt b/tests/data/meter/meter-zero.txt new file mode 100644 index 00000000..fc81f21f --- /dev/null +++ b/tests/data/meter/meter-zero.txt @@ -0,0 +1,4 @@ + +Meter text test 100% [================] 0 B/s | 0 B --:-- ETA + +Meter text test | 00:02 diff --git a/tests/test_misc.py b/tests/test_misc.py index 20f5a626..2cabc338 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -224,6 +224,20 @@ def test_misc_meter(): out = meter.output.getvalue().replace("\r", "\n") utils.diff_compare(out, os.path.join(utils.DATADIR, "meter", "meter6.txt")) + def _test_meter_zero(m, startval=0, text="Meter text test"): + with unittest.mock.patch("time.time", return_value=1.0): + m.start(text, startval) + with unittest.mock.patch("time.time", return_value=3.0): + m.update(0) + with unittest.mock.patch("time.time", return_value=3.1): + m.end() + + # meter with size 0 and startval size 0 + meter = _progresspriv.TextMeter(output=io.StringIO()) + _test_meter_zero(meter, 0) + out = meter.output.getvalue().replace("\r", "\n") + utils.diff_compare(out, os.path.join(utils.DATADIR, "meter", "meter-zero.txt")) + # BaseMeter coverage meter = _progresspriv.BaseMeter() _test_meter_values(meter) -- cgit v1.2.1