Attachment 889594 Details for Bug 1090820 – proposed patch

[patch] proposed patch

0001-Bug-1090820-Rewrite-runProcesses-method-for-memory-t.patch (text/plain), 3.22 KB, created by Guangze Bai on 2014-04-25 09:38:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guangze Bai

Created: 2014-04-25 09:38:05 UTC

Size: 3.22 KB

patch

obsolete

>From 579e022fae0b8abe3183cd5f09c4425d221dc473 Mon Sep 17 00:00:00 2001
>From: Guangze Bai <gbai@redhat.com>
>Date: Fri, 25 Apr 2014 17:29:07 +0800
>Subject: [PATCH] Bug 1090820 - Rewrite 'runProcesses' method for memory test
>
>Signed-off-by: Guangze Bai <gbai@redhat.com>
>---
> tests/memory/memory.py |   56 ++++++++++++++++++++++++------------------------
> 1 file changed, 28 insertions(+), 28 deletions(-)
>
>diff --git a/tests/memory/memory.py b/tests/memory/memory.py
>index 5f96d6f..e789aaa 100644
>--- a/tests/memory/memory.py
>+++ b/tests/memory/memory.py
>@@ -161,39 +161,39 @@ class MemoryTest(Test):
>         return (result == 0)
>     
>     def runProcesses(self, number, command):
>-        processes = 0;
>-        passed = True
>-        process = []
>         if self.mode == Constants.self:
>             command = "echo 'Self Test Mode - would have run %s'" % command
>-        for i in range(number):
>-            processCommand = Command(command)
>-            processCommand.start()
>-            process.append(processCommand)
>-            print "Started: process %u pid %u: %s" % (i, process[i].getPID(), command)
>-        sys.stdout.flush()
>-        waiting = True
>-        while waiting:
>-            waiting = False
>-            for i in range(number):
>-                if process[i]:
>-                    found = True
>-                    line = process[i].readline()
>-                    if line and len(line) > 1:
>-                        print "process %u pid %u: %s" % (i, process[i].getPID(), line)
>-                        sys.stdout.flush()
>-                    returnValue = process[i].poll()
>-                    if not returnValue or returnValue == -1:
>-                        waiting = True
>-                    else:
>-                        if returnValue > 0:
>-                            print "Error: process  %u pid %u returned %u" % (i, process[i].getPID(), returnValue)
>-                            passed = False
>-                        print "process %u pid %u returned success" % (i, process[i].getPID())
>-                        process[i] = None
>+
>+        passed = True
>+        fmt = '%-10s  %8u  %-50s'
>+        print '%-10s  %-8s  %-50s' % ('ALIAS', 'PID', 'MESSAGE')
>+        print '%-10s  %-8s  %-50s' % ('=' * 10, '=' * 8, '=' * 50)
>+        processes = [Command(command) for i in range(number)]
>+        for p in processes:
>+            p.alias = 'Process_%u' % processes.index(p)
>+            p.start()
>+            print fmt % (p.alias, p.getPID(), '[Started] ' + command)
>         sys.stdout.flush()
>+
>+        while len(processes):
>+            for p in processes:
>+                log = p.readline().strip()
>+                if log and len(log) > 0:
>+                    print fmt % (p.alias, p.getPID(), '[Log] ' + log)
>+                    sys.stdout.flush()
>+
>+                rc = p.poll()
>+                if rc is None or rc == -1:
>+                    continue
>+                if rc > 0:
>+                    passed = False
>+                print fmt % (p.alias, p.getPID(), '[Exited] %u' % rc)
>+                sys.stdout.flush()
>+                processes.remove(p)
>+
>         return passed
> 
>+
>     def runCommand(self, command):
>         if self.mode == Constants.self:
>             print "Self Test Mode, not running command"
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 1090820: 889205 | 889594 | 889629 | 890795