opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small simplification to test/functional/test_toolbox.py.

Browse Source
This commit is contained in:
John Chilton
2013-11-21 19:17:12 -06:00
parent 4ecaf654ea
commit 6a2a575e28
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/functional/test_toolbox.py
+8 -7
View File
@@ -12,10 +12,12 @@ toolbox = None
class ToolTestCase( TwillTestCase ):
"""Abstract test case that runs tests based on a `galaxy.tools.test.ToolTest`"""
def do_it( self, testdef, shed_tool_id=None ):
def do_it( self, testdef ):
"""
Run through a tool test case.
"""
shed_tool_id = self.shed_tool_id
self.__handle_test_def_errors( testdef )
latest_history = self.__setup_test_history()
@@ -206,22 +208,21 @@ def build_tests( testing_shed_tools=False ):
for i, tool_id in enumerate( toolbox.tools_by_id ):
tool = toolbox.get_tool( tool_id )
if tool.tests:
shed_tool_id = None if not testing_shed_tools else tool.id
# Create a new subclass of ToolTestCase, dynamically adding methods
# named test_tool_XXX that run each test defined in the tool config.
name = "TestForTool_" + tool.id.replace( ' ', '_' )
baseclasses = ( ToolTestCase, )
namespace = dict()
for j, testdef in enumerate( tool.tests ):
def make_test_method( td, shed_tool_id=None ):
def make_test_method( td ):
def test_tool( self ):
self.do_it( td, shed_tool_id=shed_tool_id )
self.do_it( td )
return test_tool
if testing_shed_tools:
test_method = make_test_method( testdef, shed_tool_id=tool.id )
else:
test_method = make_test_method( testdef )
test_method = make_test_method( testdef )
test_method.__doc__ = "%s ( %s ) > %s" % ( tool.name, tool.id, testdef.name )
namespace[ 'test_tool_%06d' % j ] = test_method
namespace[ 'shed_tool_id' ] = shed_tool_id
# The new.classobj function returns a new class object, with name name, derived
# from baseclasses (which should be a tuple of classes) and with namespace dict.
new_class_obj = new.classobj( name, baseclasses, namespace )