diff --git a/tests/eas/generic.py b/tests/eas/generic.py index b9acb4f622d5e06cbc482982dacfcfe6109bf7d9..7863b3a28fb3b5365026d058f9d04d103356ad38 100644 --- a/tests/eas/generic.py +++ b/tests/eas/generic.py @@ -16,6 +16,7 @@ # import os +import logging import numpy as np import pandas as pd import matplotlib.pyplot as plt @@ -75,6 +76,8 @@ class _EnergyModelTest(LisaTest): def setUpClass(cls, *args, **kwargs): super(_EnergyModelTest, cls).runExperiments(*args, **kwargs) + cls._log = logging.getLogger('_EnergyModelTest') + @classmethod def _getExperimentsConf(cls, test_env): if not test_env.nrg_model: @@ -89,7 +92,6 @@ class _EnergyModelTest(LisaTest): conf = { 'tag' : 'energy_aware', 'flags' : ['ftrace', 'freeze_userspace'], - 'sched_features' : 'ENERGY_AWARE', } if 'cpufreq' in test_env.target.modules: @@ -344,9 +346,14 @@ class _EnergyModelTest(LisaTest): slack = pa.df(task)["Slack"] bad_activations_pct = len(slack[slack < 0]) * 100. / len(slack) + + msg = 'task {} missed {}% of activations ({}% allowed)'.format( + task, bad_activations_pct, self.negative_slack_allowed_pct) + if bad_activations_pct > self.negative_slack_allowed_pct: - raise AssertionError("task {} missed {}% of activations".format( - task, bad_activations_pct)) + raise AssertionError(msg) + else: + self._log.info(msg) def _test_task_placement(self, experiment, tasks): """