summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-07-11 10:27:02 -0700
committerDylan Baker <dylan@pnwbakers.com>2017-07-18 13:20:18 -0700
commit9558ce874ba7d09fc27ce7ded01c98173ff2b957 (patch)
treebb56ceae901a59322d1266804a83a75c64d97a04
parenteda25a4a2229f5d2f32deea206a1bf9191043ec6 (diff)
framework: Don't stop resume because no tests are left to be run
It's completely possible that if piglit resume is run with the -n flag (don't retry incomplete tests), that piglit resume could be invoked with no tests left to run. In this case it makes sense to let piglit resume just finalize the backend and produce a unified result. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> cc: Martin Peres <martin.peres@linux.intel.com> Tested-by: Hector Edmundo Ramirez Gomez
-rw-r--r--framework/programs/run.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/framework/programs/run.py b/framework/programs/run.py
index 508bc05c4..ef268f722 100644
--- a/framework/programs/run.py
+++ b/framework/programs/run.py
@@ -35,6 +35,7 @@ import six
from framework import core, backends, exceptions, options
from framework import dmesg
+from framework import exceptions
from framework import monitoring
from framework import profile
from framework.results import TimeAttribute
@@ -435,11 +436,15 @@ def resume(input_):
p.forced_test_list = results.options['forced_test_list']
# This is resumed, don't bother with time since it won't be accurate anyway
- profile.run(
- profiles,
- results.options['log_level'],
- backend,
- results.options['concurrent'])
+ try:
+ profile.run(
+ profiles,
+ results.options['log_level'],
+ backend,
+ results.options['concurrent'])
+ except exceptions.PiglitUserError as e:
+ if str(e) != 'no matching tests':
+ raise
backend.finalize()