2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/0b2ecfd14689/ Changeset: 0b2ecfd14689 User: jmchilton Date: 2013-12-02 21:57:00 Summary: Tell nose functions in lib/galaxy/tools/test.py are not unit tests. Affected #: 1 file diff -r cf0d0001893cabb08a01a6d8938f3aa24be4cada -r 0b2ecfd1468979ea94b00c12eaafcac6f330b37e lib/galaxy/tools/test.py --- a/lib/galaxy/tools/test.py +++ b/lib/galaxy/tools/test.py @@ -4,6 +4,10 @@ from parameters import basic from parameters import grouping from galaxy.util import string_as_bool +try: + from nose.tools import nottest +except ImportError: + nottest = lambda x: x import logging log = logging.getLogger( __name__ ) @@ -14,6 +18,7 @@ DEFAULT_MAX_SECS = 120 +@nottest def parse_tests_elem(tool, tests_elem): """ Build ToolTestBuilder objects for each "<test>" elements and @@ -196,6 +201,7 @@ return require_file( name, value, extra, self.required_files ) +@nottest def test_data_iter( required_files ): for fname, extra in required_files: data_dict = dict( https://bitbucket.org/galaxy/galaxy-central/commits/ef33472f0aa2/ Changeset: ef33472f0aa2 User: jmchilton Date: 2013-12-02 21:57:00 Summary: Fix test case in test/unit/test_tool_deps.py which fails if modulecmd is unavailable. Affected #: 1 file diff -r 0b2ecfd1468979ea94b00c12eaafcac6f330b37e -r ef33472f0aa296e55fd811357e09366f9cee5467 test/unit/test_tool_deps.py --- a/test/unit/test_tool_deps.py +++ b/test/unit/test_tool_deps.py @@ -293,7 +293,7 @@ def test_config_module_defaults(): with __parse_resolvers('''<dependency_resolvers> - <modules /> + <modules prefetch="false" /></dependency_resolvers> ''') as dependency_resolvers: module_resolver = dependency_resolvers[0] 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.