From 569fa6e11ac1f28a7a5ab4fed05a3e3e730994d1 Mon Sep 17 00:00:00 2001 From: Karl Chen Date: Fri, 4 Jun 2004 13:45:48 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=3506 --- checkin_notes | 5 ++++- test/testbase.py | 36 +++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/checkin_notes b/checkin_notes index 2f093aa49e..f2b9ead4d0 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13018,4 +13018,7 @@ Karl 2004-04-04 0.5 - this should help MySQL servers that disconnect under load. Also added a message on how to change it. - test/tesetbase.py + - simplified code in ProjectList + + test/ + testbase.py diff --git a/test/testbase.py b/test/testbase.py index 9d01ad3e27..f511f81523 100644 --- a/test/testbase.py +++ b/test/testbase.py @@ -190,16 +190,34 @@ class ProjectList(list): list.__init__(self) self.state = '' self.pm_started = False - def install(self): self.state = ''; map(lambda i: i.install(), self) - def run(self): self.set_progress_state('INIT '); map(lambda i: i.run(), self) - def run_init_wait(self): map(lambda i: i.run_init_wait(), self); self.set_progress_state('RUNNING ') - def run_finish_wait(self): self.set_progress_state('FINISH '); map(lambda i: i.run_finish_wait(), self); self.state='DONE ' - def check(self): map(lambda i: i.check(), self); self.state - def stop(self): map(lambda i: i.maybe_stop(), self) + def install(self): + self.state = '' + for i in self: + i.install() + def run(self): + self.set_progress_state('INIT ') + for i in self: + i.run() + def run_init_wait(self): + for i in self: + i.run_init_wait() + self.set_progress_state('RUNNING ') + def run_finish_wait(self): + self.set_progress_state('FINISH ') + for i in self: + i.run_finish_wait() + self.state='DONE ' + def check(self): + for i in self: + i.check() + def stop(self): + for i in self: + i.maybe_stop() def get_progress(self): - return self.state + " " + ' | '.join( - map(lambda project: project.short_name+": "+project.progress_meter_status(), - self)) + progress = [] + for project in self: + progress.append(project.short_name + ": " + project.progress_meter_status()) + return self.state + " " + ' | '.join(progress) def start_progress_meter(self): for project in self: project.progress_meter_ctor()