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

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/0a0dc4011294/ Changeset: 0a0dc4011294 Branch: next-stable User: jmchilton Date: 2014-12-06 04:30:52+00:00 Summary: Mark test_toolbox:build_tests as "not a test". This will prevent run_tests.sh from picking up the extra test when running full test tool box - the way planemo does (i.e. this fixes the problem where planemo always runs one extra passing test). Affected #: 1 file diff -r c906eacc8d543384ad84b87f34e6b515fc695bcd -r 0a0dc401129472073a93a095ced211179ff1c5a4 test/functional/test_toolbox.py --- a/test/functional/test_toolbox.py +++ b/test/functional/test_toolbox.py @@ -5,6 +5,11 @@ from galaxy.tools import DataManagerTool from galaxy.util import bunch import logging +try: + from nose.tools import nottest +except ImportError: + nottest = lambda x: x + log = logging.getLogger( __name__ ) toolbox = None @@ -82,6 +87,7 @@ raise +@nottest def build_tests( app=None, testing_shed_tools=False, master_api_key=None, user_api_key=None ): """ If the module level variable `toolbox` is set, generate `ToolTestCase` https://bitbucket.org/galaxy/galaxy-central/commits/e2bfb1e6e3c5/ Changeset: e2bfb1e6e3c5 User: jmchilton Date: 2014-12-06 04:31:48+00:00 Summary: Merge next-stable. Affected #: 1 file diff -r 79cea2ce170e61db6afd6d249379b96cf353f15b -r e2bfb1e6e3c5845e4e1518e620dcf7fbcdc21a0c test/functional/test_toolbox.py --- a/test/functional/test_toolbox.py +++ b/test/functional/test_toolbox.py @@ -5,6 +5,11 @@ from galaxy.tools import DataManagerTool from galaxy.util import bunch import logging +try: + from nose.tools import nottest +except ImportError: + nottest = lambda x: x + log = logging.getLogger( __name__ ) toolbox = None @@ -82,6 +87,7 @@ raise +@nottest def build_tests( app=None, testing_shed_tools=False, master_api_key=None, user_api_key=None ): """ If the module level variable `toolbox` is set, generate `ToolTestCase` 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.