commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/97ad9d937454/ Changeset: 97ad9d937454 User: jmchilton Date: 2013-10-15 04:50:12 Summary: Bug fix in test exception handling code. Affected #: 1 file diff -r 6342b2fa44e5dc27d72868a93a536d5f9fe48375 -r 97ad9d937454d58413125c72608aaf4b1fa933d3 test/tool_shed/base/twilltestcase.py --- a/test/tool_shed/base/twilltestcase.py +++ b/test/tool_shed/base/twilltestcase.py @@ -1308,6 +1308,6 @@ # This timeout currently defaults to 180 seconds, or 3 minutes. if timeout_counter > common.repository_installation_timeout: raise AssertionError( 'Repository installation timed out, %d seconds elapsed, repository state is %s.' % \ - ( timeout_counter, repository.status ) ) + ( timeout_counter, galaxy_repository.status ) ) break time.sleep( 1 ) https://bitbucket.org/galaxy/galaxy-central/commits/31442bf4317b/ Changeset: 31442bf4317b User: jmchilton Date: 2013-10-15 04:50:12 Summary: Bug fix in scripts/functional_tests.py. A tempdir is referenced before it is created in certain cases. Affected #: 1 file diff -r 97ad9d937454d58413125c72608aaf4b1fa933d3 -r 31442bf4317bf2d8841255a36a42292f319f60e6 scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -230,11 +230,11 @@ default_cluster_job_runner = default_cluster_job_runner ) psu_production = True else: + tempdir = tempfile.mkdtemp( dir=galaxy_test_tmp_dir ) # Configure the database path. if 'GALAXY_TEST_DBPATH' in os.environ: galaxy_db_path = os.environ[ 'GALAXY_TEST_DBPATH' ] else: - tempdir = tempfile.mkdtemp( dir=galaxy_test_tmp_dir ) galaxy_db_path = os.path.join( tempdir, 'database' ) # Configure the paths Galaxy needs to test tools. file_path = os.path.join( galaxy_db_path, 'files' ) 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