diff --git a/checkin_notes b/checkin_notes index b500a9302e..1730d1afce 100755 --- a/checkin_notes +++ b/checkin_notes @@ -7933,6 +7933,7 @@ David 28 Nov 2003 Karl 2003-11-28 - fixed testbase.py not working due to change in client default benchmark + - fixed problem with app_versions due to checking major version test/ testbase.py diff --git a/py/Boinc/database.py b/py/Boinc/database.py index 3c8a609518..c03b4351ad 100644 --- a/py/Boinc/database.py +++ b/py/Boinc/database.py @@ -101,7 +101,13 @@ class User(DatabaseObject): 'url', 'send_email', 'show_hosts', - 'posts' ]) + 'posts', + 'seti_id', + 'seti_nresults', + 'seti_last_result_time', + 'seti_total_cpu', + 'signature' + ]) class Team(DatabaseObject): _table = DatabaseTable( @@ -217,7 +223,9 @@ class Result(DatabaseObject): 'granted_credit', 'opaque', 'random', - 'client_version_num' ]) + 'client_version_num', + 'appid' + ]) class Workseq(DatabaseObject): _table = DatabaseTable( diff --git a/test/testbase.py b/test/testbase.py index c5b4aa9ca1..a246e2c6f5 100644 --- a/test/testbase.py +++ b/test/testbase.py @@ -350,7 +350,7 @@ class TestProject(Project): def progress_meter_ctor(self): pass def progress_meter_status(self): - return "WUs: [A:%d T:%d] Results: [U:%d,P:%d,O:%d T:%d]" % ( + return "WUs: [A:%d T:%d] Results: [U:%d,IP:%d,O:%d T:%d]" % ( num_wus_assimilated(), #num_wus(), self.num_wu, @@ -459,7 +459,7 @@ class AppVersion(database.AppVersion): def __init__(self, app, platform, exec_file): database.AppVersion.__init__(self,id=None) self.app = app - self.version_num = 1 + self.version_num = version.MAJOR_VERSION * 100 self.platform = platform self.min_core_version = 1 self.max_core_version = 999