From b1a01f777fd87f7f40243bbd3e7bff7642f6b2d7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Wed, 11 Jul 2018 10:21:46 +0100 Subject: [PATCH] fw/execution: rename things for clarity - Rename "instrument_name" to "instrument" inside do_execute(), as ConfigManger.get_instrument() returns a list of Instrument objects, not names. - To avoid name clash, rename the imported instrument module to "instrumentation". --- wa/framework/execution.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wa/framework/execution.py b/wa/framework/execution.py index 1c80f181..5906ba3f 100644 --- a/wa/framework/execution.py +++ b/wa/framework/execution.py @@ -23,7 +23,7 @@ from copy import copy from datetime import datetime import wa.framework.signal as signal -from wa.framework import instrument +from wa.framework import instrument as instrumentation from wa.framework.configuration.core import Status from wa.framework.exception import TargetError, HostError, WorkloadError from wa.framework.exception import TargetNotRespondingError, TimeoutError # pylint: disable=redefined-builtin @@ -405,9 +405,9 @@ class Executor(object): context.output.write_state() self.logger.info('Installing instruments') - for instrument_name in context.cm.get_instruments(self.target_manager.target): - instrument.install(instrument_name, context) - instrument.validate() + for instrument in context.cm.get_instruments(self.target_manager.target): + instrumentation.install(instrument, context) + instrumentation.validate() self.logger.info('Installing output processors') pm = ProcessorManager()