This commit is contained in:
Timur Torubarov 2016-06-14 16:53:58 +03:00
parent 1d6b611e80
commit ba4522f7d5

View File

@ -34,17 +34,15 @@ class Plugin(AbstractPlugin):
def configure(self): def configure(self):
self.device_id = self.get_option("device_id", None).strip() self.device_id = self.get_option("device_id", None).strip()
if not self.device_id: if self.device_id:
modify = ''
else:
modify = '-s {device_id}'.format(device_id=self.device_id) modify = '-s {device_id}'.format(device_id=self.device_id)
for key, value in self.cmds.iteritems(): for key, value in self.cmds.iteritems():
self.cmds[key] = value % modify self.cmds[key] = value % modify
self.logfile = self.core.mkstemp(".log", "battery_historian_") self.logfile = self.core.mkstemp(".log", "battery_historian_")
self.core.add_artifact_file(self.logfile) self.core.add_artifact_file(self.logfile)
def prepare_test(self): def prepare_test(self):
if self.device_id:
try: try:
out = subprocess.check_output(self.cmds['enable_full_log'], shell=True) out = subprocess.check_output(self.cmds['enable_full_log'], shell=True)
logger.debug('Enabling full-log: %s', out) logger.debug('Enabling full-log: %s', out)
@ -54,6 +52,7 @@ class Plugin(AbstractPlugin):
logger.error('Error trying to prepare battery historian plugin', exc_info=True) logger.error('Error trying to prepare battery historian plugin', exc_info=True)
def end_test(self, retcode): def end_test(self, retcode):
if self.device_id:
try: try:
logger.debug('dumping battery stats') logger.debug('dumping battery stats')
dump = subprocess.Popen(self.cmds['dump'], stdout=subprocess.PIPE, shell=True).communicate()[0] dump = subprocess.Popen(self.cmds['dump'], stdout=subprocess.PIPE, shell=True).communicate()[0]