Fix for LibraryDatasetDatasetAssociation objects when created by importing a history item iinto a library, the copied_from_history_dataset_association_id will now be kept.

Add a get_display_name() method to the LibraryDatasetDatasetAssociation class.

Fix for the test_forms_and_requests.py functional test script, purge all created libraries created during the tests so following test runs will test correctly.
This commit is contained in:
Greg Von Kuster
2010-06-02 14:24:48 -04:00
parent cb70efddd8
commit 3135ffa5fc
2 changed files with 24 additions and 3 deletions
@@ -382,6 +382,16 @@ class TestFormsAndRequests( TwillTestCase ):
sa_session.delete( a )
sa_session.flush()
##################
# Purge all libraries
##################
for library in [ library_one ]:
self.delete_library_item( 'library_admin',
self.security.encode_id( library.id ),
self.security.encode_id( library.id ),
library.name,
item_type='library' )
self.purge_library( self.security.encode_id( library.id ), library.name )
##################
# Eliminate all non-private roles
##################
for role in [ role_one, role_two ]: