Correct an issue in PR issue #979 (for #issue #170) because the get_stats method overwrite the default get_method. Rename it to get_device_stats

This commit is contained in:
nicolargo 2016-12-17 10:35:09 +01:00
parent c28a00ffb4
commit 1e36444f18
2 changed files with 6 additions and 4 deletions

View File

@ -71,6 +71,7 @@ class Plugin(GlancesPlugin):
return self.nvml_ready
@GlancesPlugin._check_decorator
@GlancesPlugin._log_result_decorator
def update(self):
"""Update the GPU stats"""
@ -81,13 +82,13 @@ class Plugin(GlancesPlugin):
return self.stats
if self.input_method == 'local':
self.stats = self.get_stats()
self.stats = self.get_device_stats()
elif self.input_method == 'snmp':
# not available
pass
# Update the view
self.update_views()
# self.update_views()
return self.stats
@ -101,9 +102,10 @@ class Plugin(GlancesPlugin):
"""
return [pynvml.nvmlDeviceGetHandleByIndex(i) for i in range(0, pynvml.nvmlDeviceGetCount())]
def get_stats(self):
def get_device_stats(self):
"""Get GPU stats"""
stats = []
for index, device_handle in enumerate(self.device_handles):
device_stats = {}
device_stats['key'] = index

View File

@ -95,7 +95,7 @@ class TestGlances(unittest.TestCase):
self.assertIsInstance(req.json(), text_type)
elif p in ('fs', 'percpu', 'sensors', 'alert', 'processlist', 'diskio',
'hddtemp', 'batpercent', 'network', 'folders', 'amps', 'ports',
'irq', 'wifi'):
'irq', 'wifi', 'gpu'):
self.assertIsInstance(req.json(), list)
elif p in ('psutilversion', 'help'):
pass