Changeset 368

Show
Ignore:
Timestamp:
Tue Jan 8 05:21:12 2008
Author:
Brian
Message:

Update server test to work with web_security values of both 'session' and 'none'

Files:

Legend:

Unmodified
Added
Removed
Modified

  • server/trunk/update/test/test_update_server.py

    r367 r368  
    36 36 # 060407 - Brian - test resource filter  
    37 37 # 071228 - Brian - corrected all tests to work with current version of server  
      38 # 080108 - Brian - some tests change base on server's web_security setting  
    38 39  
    39 40 import  os  
    …… 
    178 179     Result(result)  
    179 180  
      181     Test("verify server version (get_server_version):")  
      182     result = server.get_server_version('test_version: 2008-01-08')  
      183     compare_values('works with server version', '0.1a', result.get('server_version'))  
      184     web_security = result.get('web_security') or ''  # several tests are changed based on this  
      185     Result(result)  
      186  
    180 187     Test("ask server to create a test database (activate_test_database):")  
    181 188     parms = {  
    …… 
    241 248         'DB': 0,  # use first database that is in the session  
    242 249         }  
      250     if web_security == 'none':  
      251         web_parms['DB'] = 100  
    243 252     update_count += 1  
    244 253     changes = []  
    …… 
    258 267         "Report": 0,  
    259 268         }  
      269     if web_security == 'none':  
      270         web_parms['DB'] = 100  
    260 271     page = """  
    261 272 <html><HEAD>  
    …… 
    272 283         "Report": 1,  
    273 284         }  
      285     if web_security == 'none':  
      286         web_parms['DB'] = 100  
    274 287     page = """  
    275 288 <html><HEAD>  
    …… 
    286 299         "Report": 4,  
    287 300         }  
      301     if web_security == 'none':  
      302         web_parms['DB'] = 100  
    288 303     page = """  
    289 304 <html><HEAD><title>  

  • server/trunk/update/server/ganttpv_update_server.py

    r364 r368  
    32 32 # 060826 - publish service availability via zero config  
    33 33 # 061009 - Brian - use config file for ip, etc.  
      34 # 080108 - Brian - added server version message  
      35  
      36 server_version = '0.1a'  
      37 print "Starting GanttPV Server version %s" % server_version  
    34 38  
    35 39 import SimpleXMLRPCServer  
    …… 
    123 127 def giveback(x): return x  
    124 128 def givebackab(a, b): return a + b  
      129 def get_server_version(a): return {  
      130     'server_version': server_version,  
      131     'server_name': server_name,  
      132     'web_security': web_security,  
      133     }  
    125 134  
    126 135 # used to check permissions  
    …… 
    979 988     server.register_function(giveback)  
    980 989     server.register_function(givebackab)  
      990     server.register_function(get_server_version)  
    981 991  
    982 992     # Find out what records the server has