Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > d88c7bb437f1a231687f3169871ec55f > files > 5

bootchart-0.14.0-1.3.git20110630.4.mga3.src.rpm

From 3e76242a0607dc1bd27743f3307a602514036eba Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Sat, 19 Mar 2011 12:33:27 +0100
Subject: [PATCH] tests: Fix errors and failures of testParseProcPsLog()

---
 pybootchartgui/tests/parser_test.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pybootchartgui/tests/parser_test.py b/pybootchartgui/tests/parser_test.py
index 8739485..c9adeea 100644
--- a/pybootchartgui/tests/parser_test.py
+++ b/pybootchartgui/tests/parser_test.py
@@ -41,20 +41,20 @@ class TestBCParser(unittest.TestCase):
 		trace = parsing.Trace(writer, args, options)
 		state = parsing.parse_file(writer, trace, self.mk_fname('proc_ps.log'))
 		samples = state.ps_stats
-		processes = samples.process_list
-		sorted_processes = sorted(processes, key=lambda p: p.pid )
+		processes = samples.process_map
+		sorted_processes = [processes[k] for k in sorted(processes.keys())]
 		
 		for index, line in enumerate(open(self.mk_fname('extract2.proc_ps.log'))):
 			tokens = line.split();
 			process = sorted_processes[index]
 			if debug:	
 				print(tokens[0:4])
-				print(process.pid, process.cmd, process.ppid, len(process.samples))
+				print(process.pid / 1000, process.cmd, process.ppid, len(process.samples))
 				print('-------------------')
-			
-			self.assertEqual(tokens[0], str(process.pid))
+
+			self.assertEqual(tokens[0], str(process.pid / 1000))
 			self.assertEqual(tokens[1], str(process.cmd))
-			self.assertEqual(tokens[2], str(process.ppid))
+			self.assertEqual(tokens[2], str(process.ppid / 1000))
 			self.assertEqual(tokens[3], str(len(process.samples)))