opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Histories, API: do not consider deleted datasets when calculating history state; test

Browse Source
This commit is contained in:
Carl Eberhard
2015-05-12 16:57:17 -04:00
parent 32edb07930
commit d1c14bd1a1
2 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/managers/histories.py
+4 -4
View File
@@ -282,21 +282,21 @@ class HistorySerializer( sharable.SharableModelSerializer, deletable.PurgableSer
state = states.ERROR
# TODO: history_state and state_counts are classically calc'd at the same time
# so this is rel. ineff. - if we keep this...
hda_state_counts = self.serialize_state_counts( history, 'counts', exclude_deleted=False, **context )
hda_state_counts = self.serialize_state_counts( history, 'counts', exclude_deleted=True, **context )
num_hdas = sum( hda_state_counts.values() )
if num_hdas == 0:
state = states.NEW
else:
if ( hda_state_counts[ states.RUNNING ] > 0
or hda_state_counts[ states.SETTING_METADATA ] > 0
or hda_state_counts[ states.UPLOAD ] > 0 ):
or hda_state_counts[ states.SETTING_METADATA ] > 0
or hda_state_counts[ states.UPLOAD ] > 0 ):
state = states.RUNNING
# TODO: this method may be more useful if we *also* polled the histories jobs here too
elif hda_state_counts[ states.QUEUED ] > 0:
state = states.QUEUED
elif ( hda_state_counts[ states.ERROR ] > 0
or hda_state_counts[ states.FAILED_METADATA ] > 0 ):
or hda_state_counts[ states.FAILED_METADATA ] > 0 ):
state = states.ERROR
elif hda_state_counts[ states.OK ] == num_hdas:
state = states.OK
test/unit/managers/test_HistoryManager.py
+72
View File
@@ -441,6 +441,78 @@ class HistorySerializerTestCase( BaseTestCase ):
self.log( 'serialized should jsonify well' )
self.assertIsJsonifyable( serialized )
def _history_state_from_states_and_deleted( self, user, hda_state_and_deleted_tuples ):
history = self.history_manager.create( name='name', user=user )
for state, deleted in hda_state_and_deleted_tuples:
hda = self.hda_manager.create( history=history )
hda = self.hda_manager.update( hda, dict( state=state, deleted=deleted ) )
history_state = self.history_serializer.serialize( history, [ 'state' ] )[ 'state' ]
return history_state
def test_state( self ):
dataset_states = model.Dataset.states
user2 = self.user_manager.create( **user2_data )
ready_states = [ ( state, False ) for state in [ dataset_states.OK, dataset_states.OK ] ]
self.log( 'a history\'s serialized state should be running if any of its datasets are running' )
self.assertEqual( 'running', self._history_state_from_states_and_deleted( user2,
ready_states + [( dataset_states.RUNNING, False )] ))
self.assertEqual( 'running', self._history_state_from_states_and_deleted( user2,
ready_states + [( dataset_states.SETTING_METADATA, False )] ))
self.assertEqual( 'running', self._history_state_from_states_and_deleted( user2,
ready_states + [( dataset_states.UPLOAD, False )] ))
self.log( 'a history\'s serialized state should be queued if any of its datasets are queued' )
self.assertEqual( 'queued', self._history_state_from_states_and_deleted( user2,
ready_states + [( dataset_states.QUEUED, False )] ))
self.log( 'a history\'s serialized state should be error if any of its datasets are errored' )
self.assertEqual( 'error', self._history_state_from_states_and_deleted( user2,
ready_states + [( dataset_states.ERROR, False )] ))
self.assertEqual( 'error', self._history_state_from_states_and_deleted( user2,
ready_states + [( dataset_states.FAILED_METADATA, False )] ))
self.log( 'a history\'s serialized state should be ok if *all* of its datasets are ok' )
self.assertEqual( 'ok', self._history_state_from_states_and_deleted( user2, ready_states ))
self.log( 'a history\'s serialized state should be not be affected by deleted datasets' )
self.assertEqual( 'ok', self._history_state_from_states_and_deleted( user2,
ready_states + [( dataset_states.RUNNING, True )] ))
def test_contents( self ):
user2 = self.user_manager.create( **user2_data )
history1 = self.history_manager.create( name='history1', user=user2 )
self.log( 'a history with no contents should be properly reflected in empty, etc.' )
keys = [ 'empty', 'count', 'state_ids', 'state_details', 'state', 'hdas' ]
serialized = self.history_serializer.serialize( history1, keys )
self.assertEqual( serialized[ 'state' ], 'new' )
self.assertEqual( serialized[ 'empty' ], True )
self.assertEqual( serialized[ 'count' ], 0 )
self.assertEqual( sum( serialized[ 'state_details' ].values() ), 0 )
self.assertEqual( serialized[ 'state_ids' ][ 'ok' ], [] )
self.assertIsInstance( serialized[ 'hdas' ], list )
self.log( 'a history with contents should be properly reflected in empty, etc.' )
hda1 = self.hda_manager.create( history=history1, hid=1 )
self.hda_manager.update( hda1, dict( state='ok' ) )
serialized = self.history_serializer.serialize( history1, keys )
self.assertEqual( serialized[ 'state' ], 'ok' )
self.assertEqual( serialized[ 'empty' ], False )
self.assertEqual( serialized[ 'count' ], 1 )
self.assertEqual( serialized[ 'state_details' ][ 'ok' ], 1 )
self.assertIsInstance( serialized[ 'state_ids' ][ 'ok' ], list )
self.assertIsInstance( serialized[ 'hdas' ], list )
self.assertIsInstance( serialized[ 'hdas' ][0], basestring )
serialized = self.history_serializer.serialize( history1, [ 'contents' ] )
self.assertHasKeys( serialized[ 'contents' ][0], [ 'id', 'name', 'peek', 'create_time' ])
self.log( 'serialized should jsonify well' )
self.assertIsJsonifyable( serialized )
# # =============================================================================
# class HistoryDeserializerTestCase( BaseTestCase ):