made NetTxRx.check() a bit better

added detecting for RX-OK and TX-OK positions (sick and tired from hardcoded values) and check that fields are numeric

https://travis-ci.org/nnugumanov/yandex-tank/builds/31090916 - successfully built
This commit is contained in:
nnugumanov 2014-07-29 03:02:22 +04:00
parent fcf56cded1
commit a600194211

View File

@ -427,11 +427,20 @@ class NetTxRx(AbstractMetric):
rx, tx = 0, 0
if status == 0:
for line in data.split('\n')[1:]:
counters = line.split()
rx += int(counters[3])
tx += int(counters[7])
try:
lines = data.split('\n')
position = lambda sample: lines[0].split().index(sample)
rx_pos = position('RX-OK')
tx_pos = position('TX-OK')
for line in lines[1:]:
counters = line.split()
if counters[rx_pos].isdigit() and counters[tx_pos].isdigit():
rx += int(counters[rx_pos])
tx += int(counters[tx_pos])
except Exception, e:
logging.error('Failed to parse ifconfig output %s: %s', data, e)
logging.debug("Total RX/TX packets counters: %s", [str(rx), str(tx)])
if self.prev_rx == 0: