Changeset 284

Show
Ignore:
Timestamp:
01/30/08 01:25:59 (10 months ago)
Author:
t
Message:

stopped doing the database drop & sped up tests dramatically. may cause problems down the road...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/cartwheel-server/tests/functional-tests/__init__.py

    r145 r284  
    4949    assert int(verify) 
    5050 
     51    m = cartwheel.db.ObjectManager() 
     52    c = m.cursor() 
     53 
     54    c.execute("DELETE FROM batchqueue_requests;") 
     55    c.execute("DELETE FROM folders;") 
     56    c.execute("DELETE FROM labs;") 
     57    c.execute("DELETE FROM users;") 
     58     
     59    m.commit() 
     60 
    5161    # drop & recreate the test database 
    52     test_utils.initialize_empty_db() 
     62#    test_utils.initialize_empty_db() 
    5363 
    5464def teardown(): 
    …… 
    5868        os.environ[cartwheel.config.environment_name] = _saved 
    5969         
    60     return 
    61  
    62     test_utils.teardown_db() 
     70#    test_utils.teardown_db() 

  • trunk/cartwheel-server/tests/functional-tests/test-with-user/__init__.py

    r54 r284  
    99    "Empty the database & create a test user & a test admin user" 
    1010     
    11     test_utils.drop_all_tables() 
    12     test_utils.load_data_model() 
     11    m = cartwheel.db.ObjectManager() 
     12    c = m.cursor() 
     13 
     14    c.execute("DELETE FROM batchqueue_requests;") 
     15    c.execute("DELETE FROM folders;") 
     16    c.execute("DELETE FROM labs;") 
     17    c.execute("DELETE FROM users;") 
     18     
     19    m.commit() 
     20 
     21#    test_utils.drop_all_tables() 
     22#    test_utils.load_data_model() 
    1323 
    1424    lab_id = create_lab('testlab', 'Test Lab')