commit/galaxy-central: 3 new changesets
3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6eeb1ac6b732/ Changeset: 6eeb1ac6b732 Branch: next-stable User: jmchilton Date: 2014-11-19 17:42:17+00:00 Summary: Remove unused code. Affected #: 1 file diff -r 61f42ba042e6eefb830ebc3203cd98a57f47f690 -r 6eeb1ac6b732573552532a6f8baff9610647f2cf test/base/interactor.py --- a/test/base/interactor.py +++ b/test/base/interactor.py @@ -270,12 +270,6 @@ pass return wait - def __wait_for_job( self, job_id ): - def wait(): - while not self.__job_ready( job_id ): - pass - return wait - def __job_ready( self, job_id ): job_json = self._get( "jobs/%s" % job_id ).json() state = job_json[ 'state' ] https://bitbucket.org/galaxy/galaxy-central/commits/b81798f94dc0/ Changeset: b81798f94dc0 Branch: next-stable User: jmchilton Date: 2014-11-19 17:42:17+00:00 Summary: Bug fix for 21e3d69. Affected #: 1 file diff -r 6eeb1ac6b732573552532a6f8baff9610647f2cf -r b81798f94dc0fd14de1d585ed7e57f820f998fae test/base/interactor.py --- a/test/base/interactor.py +++ b/test/base/interactor.py @@ -59,7 +59,7 @@ attributes = output_testdef.attributes name = output_testdef.name for job in jobs: - self.wait_for_job( job[ 'id' ], maxseconds ) + self.wait_for_job( job[ 'id' ], history_id, maxseconds ) hid = self.__output_id( output_data ) fetcher = self.__dataset_fetcher( history_id ) ## TODO: Twill version verifys dataset is 'ok' in here. @@ -115,8 +115,8 @@ def wait_for_history( self, history_id, maxseconds ): self.twill_test_case.wait_for( lambda: not self.__history_ready( history_id ), maxseconds=maxseconds) - def wait_for_job( self, job_id, maxseconds ): - self.twill_test_case.wait_for( lambda: not self.__job_ready( job_id ), maxseconds=maxseconds) + def wait_for_job( self, job_id, history_id, maxseconds ): + self.twill_test_case.wait_for( lambda: not self.__job_ready( job_id, history_id ), maxseconds=maxseconds) def get_job_stdio( self, job_id ): job_stdio = self.__get_job_stdio( job_id ).json() @@ -270,14 +270,14 @@ pass return wait - def __job_ready( self, job_id ): + def __job_ready( self, job_id, history_id ): job_json = self._get( "jobs/%s" % job_id ).json() state = job_json[ 'state' ] try: return self._state_ready( state, error_msg="Job in error state." ) except Exception: if VERBOSE_ERRORS: - self._summarize_job_errors( history_id ) + self._summarize_history_errors( history_id ) raise def __history_ready( self, history_id ): https://bitbucket.org/galaxy/galaxy-central/commits/a799879a82c5/ Changeset: a799879a82c5 Branch: next-stable User: jmchilton Date: 2014-11-19 17:42:17+00:00 Summary: Enable more verbose errors for install and test framework(?). Not actually sure if they will show up in the GUI - hopefully. Affected #: 1 file diff -r b81798f94dc0fd14de1d585ed7e57f820f998fae -r a799879a82c54c2d1afec6e33d8918479bbf2373 install_and_test_tool_shed_repositories.sh --- a/install_and_test_tool_shed_repositories.sh +++ b/install_and_test_tool_shed_repositories.sh @@ -1,5 +1,9 @@ #!/bin/sh +# Enable verbose test errors for install and test framework. +GALAXY_TEST_VERBOSE_ERRORS="True" +export GALAXY_TEST_VERBOSE_ERRORS + # A good place to look for nose info: http://somethingaboutorange.com/mrl/projects/nose/ # The test/install_and_test_tool_shed_repositories/functional_tests.py cannot be executed directly because it must 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.
participants (1)
-
commits-noreply@bitbucket.org