[galaxy-commits] commit/galaxy-central: 2 new changesets

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e6ad98134741/ Changeset: e6ad98134741 User: jmchilton Date: 2013-12-04 18:42:43 Summary: Load plugins in a deterministic order. Fixes plugin unit tests on my dev box and is a good idea overall anyway. Affected #: 1 file diff -r 1ff7ac24ec0011ed3da190164e4e5b1877741e62 -r e6ad9813474196d2ebd110c6716fb6650ea2ae9e lib/galaxy/web/base/pluginframework.py --- a/lib/galaxy/web/base/pluginframework.py +++ b/lib/galaxy/web/base/pluginframework.py @@ -146,7 +146,7 @@ # due to the ordering of listdir, there is an implicit plugin loading order here # could instead explicitly list on/off in master config file for directory in self.directories: - for plugin_dir in os.listdir( directory ): + for plugin_dir in sorted( os.listdir( directory ) ): plugin_path = os.path.join( directory, plugin_dir ) if self.is_plugin( plugin_path ): yield plugin_path https://bitbucket.org/galaxy/galaxy-central/commits/bbdb9255aa9a/ Changeset: bbdb9255aa9a User: jmchilton Date: 2013-12-04 18:46:32 Summary: Allow run_unit_tests.sh to execute all unit tests in test/unit. Basically adds __init__.py files to each subdirectory so nose detects these as Python module directories. Also modify dynamic loading of modules in Carl's test cases so the test case can be run with any cwd - including the Galaxy root directory as run_unit_tests.sh will use. This should roughly double the number of unit tests buildbot runs. Affected #: 6 files diff -r e6ad9813474196d2ebd110c6716fb6650ea2ae9e -r bbdb9255aa9a1b4d30e08e8da0276d28422c5805 test/unit/datatypes/dataproviders/test_base_dataproviders.py --- a/test/unit/datatypes/dataproviders/test_base_dataproviders.py +++ b/test/unit/datatypes/dataproviders/test_base_dataproviders.py @@ -7,13 +7,14 @@ #TODO: fix off by ones in FilteredDataProvider counters +import os.path import imp import unittest import StringIO import tempfilecache -utility = imp.load_source( 'utility', '../../util/utility.py' ) +utility = imp.load_source( 'utility', os.path.join( os.path.dirname( __file__), '../../util/utility.py' ) ) log = utility.set_up_filelogger( __name__ + '.log' ) utility.add_galaxy_lib_to_path( 'test/unit/datatypes/dataproviders' ) diff -r e6ad9813474196d2ebd110c6716fb6650ea2ae9e -r bbdb9255aa9a1b4d30e08e8da0276d28422c5805 test/unit/datatypes/dataproviders/test_line_dataproviders.py --- a/test/unit/datatypes/dataproviders/test_line_dataproviders.py +++ b/test/unit/datatypes/dataproviders/test_line_dataproviders.py @@ -8,13 +8,14 @@ #TODO: fix off by ones in FilteredDataProvider counters import imp +import os import unittest import StringIO import tempfilecache import test_base_dataproviders -utility = imp.load_source( 'utility', '../../util/utility.py' ) +utility = imp.load_source( 'utility', os.path.join( os.path.dirname( __file__ ), '../../util/utility.py' ) ) log = utility.set_up_filelogger( __name__ + '.log' ) utility.add_galaxy_lib_to_path( 'test/unit/datatypes/dataproviders' ) diff -r e6ad9813474196d2ebd110c6716fb6650ea2ae9e -r bbdb9255aa9a1b4d30e08e8da0276d28422c5805 test/unit/visualizations/registry/test_VisualizationsRegistry.py --- a/test/unit/visualizations/registry/test_VisualizationsRegistry.py +++ b/test/unit/visualizations/registry/test_VisualizationsRegistry.py @@ -4,7 +4,7 @@ import imp import unittest -utility = imp.load_source( 'utility', '../../util/utility.py' ) +utility = imp.load_source( 'utility', os.path.join( os.path.dirname( __file__ ), '../../util/utility.py' ) ) log = utility.set_up_filelogger( __name__ + '.log' ) relative_test_path = '/test/unit/visualizations/registry' @@ -12,7 +12,7 @@ from galaxy.visualization.registry import VisualizationsRegistry -base_mock = imp.load_source( 'mock', '../../web/base/mock.py' ) +base_mock = imp.load_source( 'mock', os.path.join( os.path.dirname( __file__ ), '../../web/base/mock.py' ) ) # ----------------------------------------------------------------------------- globals glx_dir = os.getcwd().replace( relative_test_path, '' ) diff -r e6ad9813474196d2ebd110c6716fb6650ea2ae9e -r bbdb9255aa9a1b4d30e08e8da0276d28422c5805 test/unit/web/base/test_HookPluginManager.py --- a/test/unit/web/base/test_HookPluginManager.py +++ b/test/unit/web/base/test_HookPluginManager.py @@ -5,7 +5,7 @@ import unittest import types -utility = imp.load_source( 'utility', '../../util/utility.py' ) +utility = imp.load_source( 'utility', os.path.join( os.path.dirname( __file__ ), '../../util/utility.py' ) ) log = utility.set_up_filelogger( __name__ + '.log' ) utility.add_galaxy_lib_to_path( 'test/unit/web/base' ) diff -r e6ad9813474196d2ebd110c6716fb6650ea2ae9e -r bbdb9255aa9a1b4d30e08e8da0276d28422c5805 test/unit/web/base/test_PageServingPluginManager.py --- a/test/unit/web/base/test_PageServingPluginManager.py +++ b/test/unit/web/base/test_PageServingPluginManager.py @@ -4,7 +4,7 @@ import imp import unittest -utility = imp.load_source( 'utility', '../../util/utility.py' ) +utility = imp.load_source( 'utility', os.path.join( os.path.dirname( __file__ ), '../../util/utility.py' ) ) log = utility.set_up_filelogger( __name__ + '.log' ) utility.add_galaxy_lib_to_path( 'test/unit/web/base' ) diff -r e6ad9813474196d2ebd110c6716fb6650ea2ae9e -r bbdb9255aa9a1b4d30e08e8da0276d28422c5805 test/unit/web/base/test_PluginManager.py --- a/test/unit/web/base/test_PluginManager.py +++ b/test/unit/web/base/test_PluginManager.py @@ -5,7 +5,7 @@ import imp import unittest -utility = imp.load_source( 'utility', '../../util/utility.py' ) +utility = imp.load_source( 'utility', os.path.join( os.path.dirname( __file__ ), '../../util/utility.py' ) ) log = utility.set_up_filelogger( __name__ + '.log' ) utility.add_galaxy_lib_to_path( 'test/unit/web/base' ) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.