diff --git a/qemu/tests/cgroup.py b/qemu/tests/cgroup.py index 5f7175e7a377f94d405574a2fe301fe3e618349a..9683dfc9b152c575d796359f6f3433fe3fe7e606 100644 --- a/qemu/tests/cgroup.py +++ b/qemu/tests/cgroup.py @@ -762,13 +762,13 @@ def run(test, params, env): except ZeroDivisionError: logging.error("ZeroDivisionError in stats calculation") stats[i] = False - limit = 1 - float(params.get("cgroup_limit", 0.05)) + for i in range(1, len(stats)): # Utilisation should be 100% - allowed treshold (limit) if stats[i] < limit: - logging.debug("%d: guest time is not >%s%% %s" % (i, limit, - stats[i])) + logging.debug("%d: the utilisation of guest time is %s, " + "smaller than limit %s" % (i, stats[i], limit)) err.append(i) finally: diff --git a/qemu/tests/migration_multi_host_with_speed_measurement.py b/qemu/tests/migration_multi_host_with_speed_measurement.py index 49b2a42ec0b7b8b29d38233c467ebd6261a13570..11f67bdd3f53ca93571df2b54ac38843531b70f7 100644 --- a/qemu/tests/migration_multi_host_with_speed_measurement.py +++ b/qemu/tests/migration_multi_host_with_speed_measurement.py @@ -213,5 +213,5 @@ def run(test, params, env): if real_speed > mig_speed + ack_speed: divergence = (1 - float(mig_speed) / float(real_speed)) * 100 raise error.TestWarn("Average migration speed (%s MB/s) " - "is %3.1f %% higher than target (%s MB/s)" % + "is %3.1f%% higher than target (%s MB/s)" % (real_speed, divergence, mig_speed)) diff --git a/qemu/tests/migration_with_speed_measurement.py b/qemu/tests/migration_with_speed_measurement.py index 518b77c80adb01b408041856138c4adca3f04c51..e2ddff8ecf141aa15295c391d1926363d775129e 100644 --- a/qemu/tests/migration_with_speed_measurement.py +++ b/qemu/tests/migration_with_speed_measurement.py @@ -126,7 +126,7 @@ def run(test, params, env): if real_speed > mig_speed + ack_speed: divergence = (1 - float(mig_speed) / float(real_speed)) * 100 raise error.TestWarn("Average migration speed (%s MB/s) " - "is %3.1f %% higher than target (%s MB/s)" % + "is %3.1f%% higher than target (%s MB/s)" % (real_speed, divergence, mig_speed)) finally: