greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Test: python3 fix

pull/148/head
asergi 2012-12-15 23:35:35 +01:00
parent a70ac3a4e3
commit f474966199
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
glances/glances.py
View File

@ -2127,17 +2127,17 @@ class glancesScreen:
self.term_window.addnstr( self.term_window.addnstr(
self.process_y + 2, process_x + process_name_x, self.process_y + 2, process_x + process_name_x,
format(_("TIME+"), '>8'), 8) format(_("TIME+"), '>8'), 8)
process_name_x += 10 process_name_x += 9
# IO # IO
if tag_io: if tag_io:
self.term_window.addnstr( self.term_window.addnstr(
self.process_y + 2, process_x + process_name_x, self.process_y + 2, process_x + process_name_x,
format(_("IO_R"), '>4'), 4) format(_("IO_R"), '>5'), 5)
process_name_x += 6 process_name_x += 6
self.term_window.addnstr( self.term_window.addnstr(
self.process_y + 2, process_x + process_name_x, self.process_y + 2, process_x + process_name_x,
format(_("IO_W"), '>4'), 4) format(_("IO_W"), '>5'), 5)
process_name_x += 6 process_name_x += 7
# PROCESS NAME # PROCESS NAME
self.term_window.addnstr( self.term_window.addnstr(
self.process_y + 2, process_x + process_name_x, self.process_y + 2, process_x + process_name_x,
@ -2227,22 +2227,22 @@ class glancesScreen:
try: try:
if processlist[processes]['io_counters'] == {}: if processlist[processes]['io_counters'] == {}:
self.term_window.addnstr( self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 57, self.process_y + 3 + processes, process_x + 56,
" ?", 4) format("?", '>5'), 5)
self.term_window.addnstr( self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 63, self.process_y + 3 + processes, process_x + 62,
" ?", 4) format("?", '>5'), 5)
else: else:
# Processes are only refresh every 2 refresh_time # Processes are only refresh every 2 refresh_time
#~ elapsed_time = max(1, self.__refresh_time) * 2 #~ elapsed_time = max(1, self.__refresh_time) * 2
io_read = processlist[processes]['io_counters'][2] io_read = processlist[processes]['io_counters'][2]
self.term_window.addnstr( self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 57, self.process_y + 3 + processes, process_x + 56,
format(self.__autoUnit(io_read), '>4'), 4) format(self.__autoUnit(io_read), '>5'), 5)
io_write = processlist[processes]['io_counters'][3] io_write = processlist[processes]['io_counters'][3]
self.term_window.addnstr( self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 63, self.process_y + 3 + processes, process_x + 62,
format(self.__autoUnit(io_write), '>4'), 4) format(self.__autoUnit(io_write), '>5'), 5)
except: except:
pass pass

23
glances/unitest.py
View File

@ -24,9 +24,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import unittest import unittest
import glances
import multiprocessing import multiprocessing
# import time import glances
class TestGlancesStat(unittest.TestCase): class TestGlancesStat(unittest.TestCase):
@ -38,45 +37,45 @@ class TestGlancesStat(unittest.TestCase):
def test_Glances_getSystem(self): def test_Glances_getSystem(self):
self.stats.update() self.stats.update()
system = self.stats.getSystem() system = self.stats.getSystem()
print "System info: %s" % system print("System info: %s" % system)
self.assertTrue(len(system) > 1) self.assertTrue(len(system) > 1)
def test_Glances_getCore(self): def test_Glances_getCore(self):
self.stats.update() self.stats.update()
core = self.stats.getCore() core = self.stats.getCore()
print "CPU Core number: %s" % core print("CPU Core number: %s" % core)
self.assertEqual(core, multiprocessing.cpu_count()) self.assertEqual(core, multiprocessing.cpu_count())
def test_Glances_getCpu(self): def test_Glances_getCpu(self):
self.stats.update() self.stats.update()
cpu = self.stats.getCpu() cpu = self.stats.getCpu()
print "CPU stat %s:" % cpu print("CPU stat %s:" % cpu)
self.assertTrue(len(cpu) > 1) self.assertTrue(len(cpu) > 1)
def test_Glances_getPerCpu(self): def test_Glances_getPerCpu(self):
self.stats.update() self.stats.update()
percpu = self.stats.getPerCpu() percpu = self.stats.getPerCpu()
print "PerCPU stat %s:" % percpu print("PerCPU stat %s:" % percpu)
self.assertEqual(len(percpu), multiprocessing.cpu_count()) self.assertEqual(len(percpu), multiprocessing.cpu_count())
def test_Glances_getMem(self): def test_Glances_getMem(self):
self.stats.update() self.stats.update()
mem = self.stats.getMem() mem = self.stats.getMem()
print "Mem stat %s:" % mem print("Mem stat %s:" % mem)
self.assertTrue(len(mem) > 2) self.assertTrue(len(mem) > 2)
def test_Glances_getMemSwap(self): def test_Glances_getMemSwap(self):
self.stats.update() self.stats.update()
memswap = self.stats.getMemSwap() memswap = self.stats.getMemSwap()
print "MemSwap stat %s:" % memswap print("MemSwap stat %s:" % memswap)
self.assertTrue(len(memswap) > 2) self.assertTrue(len(memswap) > 2)
def test_Glances_getNetwork(self): def test_Glances_getNetwork(self):
self.stats.update() self.stats.update()
net = self.stats.getNetwork() net = self.stats.getNetwork()
print "Network stat %s:" % net print("Network stat %s:" % net)
self.assertTrue(len(net) > 1) self.assertTrue(len(net) > 1)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()