1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/5c93ac32ace1/ changeset: 5c93ac32ace1 user: natefoo date: 2012-04-16 20:56:24 summary: Fix job manager/handler shutdown, functional tests due to referer -> redirect rename, and check_galaxy script for dataset display -> html table change. affected #: 5 files diff -r 0b8c0fda4f852199d12e67cbd7bcdda9a99ac444 -r 5c93ac32ace1b7f61f6c95bba0a0fe04d6f85755 lib/galaxy/jobs/handler.py --- a/lib/galaxy/jobs/handler.py +++ b/lib/galaxy/jobs/handler.py @@ -255,7 +255,7 @@ else: log.info( "sending stop signal to worker thread" ) self.running = False - if not self.track_jobs_in_database: + if not self.app.config.track_jobs_in_database: self.queue.put( self.STOP_SIGNAL ) self.sleeper.wake() log.info( "job handler queue stopped" ) @@ -352,7 +352,7 @@ else: log.info( "sending stop signal to worker thread" ) self.running = False - if not self.track_jobs_in_database: + if not self.app.config.track_jobs_in_database: self.queue.put( self.STOP_SIGNAL ) self.sleeper.wake() log.info( "job handler stop queue stopped" ) diff -r 0b8c0fda4f852199d12e67cbd7bcdda9a99ac444 -r 5c93ac32ace1b7f61f6c95bba0a0fe04d6f85755 lib/galaxy/jobs/manager.py --- a/lib/galaxy/jobs/manager.py +++ b/lib/galaxy/jobs/manager.py @@ -186,7 +186,6 @@ self.queue.put( self.STOP_SIGNAL ) self.sleeper.wake() log.info( "job manager queue stopped" ) - self.dispatcher.shutdown() class JobManagerStopQueue( object ): """ diff -r 0b8c0fda4f852199d12e67cbd7bcdda9a99ac444 -r 5c93ac32ace1b7f61f6c95bba0a0fe04d6f85755 scripts/check_galaxy.py --- a/scripts/check_galaxy.py +++ b/scripts/check_galaxy.py @@ -249,7 +249,7 @@ #return((p.id, p.status)) def diff(self): - self.get("/datasets/%s/display/index" % self.id) + self.get("/datasets/%s/display/display?to_ext=bed" % self.id) data = tc.browser.get_html() tmp = tempfile.mkstemp() dprint("tmp file: %s" % tmp[1]) diff -r 0b8c0fda4f852199d12e67cbd7bcdda9a99ac444 -r 5c93ac32ace1b7f61f6c95bba0a0fe04d6f85755 test/base/twilltestcase.py --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -826,13 +826,13 @@ self.assertTrue( genome_build == dbkey ) # Functions associated with user accounts - def create( self, cntrller='user', email='test@bx.psu.edu', password='testuser', username='admin-user', webapp='galaxy', referer='' ): + def create( self, cntrller='user', email='test@bx.psu.edu', password='testuser', username='admin-user', webapp='galaxy', redirect='' ): # HACK: don't use panels because late_javascripts() messes up the twill browser and it # can't find form fields (and hence user can't be logged in). self.visit_url( "%s/user/create?cntrller=%s&use_panels=False" % ( self.url, cntrller ) ) tc.fv( '1', 'email', email ) tc.fv( '1', 'webapp', webapp ) - tc.fv( '1', 'referer', referer ) + tc.fv( '1', 'redirect', redirect ) tc.fv( '1', 'password', password ) tc.fv( '1', 'confirm', password ) tc.fv( '1', 'username', username ) @@ -936,10 +936,10 @@ self.visit_url( "%s/%s" % ( self.url, url ) ) self.check_page_for_string( 'Default history permissions have been changed.' ) self.home() - def login( self, email='test@bx.psu.edu', password='testuser', username='admin-user', webapp='galaxy', referer='' ): + def login( self, email='test@bx.psu.edu', password='testuser', username='admin-user', webapp='galaxy', redirect='' ): # test@bx.psu.edu is configured as an admin user previously_created, username_taken, invalid_username = \ - self.create( email=email, password=password, username=username, webapp=webapp, referer=referer ) + self.create( email=email, password=password, username=username, webapp=webapp, redirect=redirect ) if previously_created: # The acount has previously been created, so just login. # HACK: don't use panels because late_javascripts() messes up the twill browser and it @@ -947,7 +947,7 @@ self.visit_url( "%s/user/login?use_panels=False" % self.url ) tc.fv( '1', 'email', email ) tc.fv( '1', 'webapp', webapp ) - tc.fv( '1', 'referer', referer ) + tc.fv( '1', 'redirect', redirect ) tc.fv( '1', 'password', password ) tc.submit( 'login_button' ) def logout( self ): @@ -1212,14 +1212,14 @@ # Dataset Security stuff # Tests associated with users def create_new_account_as_admin( self, email='test4@bx.psu.edu', password='testuser', - username='regular-user4', webapp='galaxy', referer='' ): + username='regular-user4', webapp='galaxy', redirect='' ): """Create a new account for another user""" # HACK: don't use panels because late_javascripts() messes up the twill browser and it # can't find form fields (and hence user can't be logged in). self.visit_url( "%s/user/create?cntrller=admin" % self.url ) tc.fv( '1', 'email', email ) tc.fv( '1', 'webapp', webapp ) - tc.fv( '1', 'referer', referer ) + tc.fv( '1', 'redirect', redirect ) tc.fv( '1', 'password', password ) tc.fv( '1', 'confirm', password ) tc.fv( '1', 'username', username ) diff -r 0b8c0fda4f852199d12e67cbd7bcdda9a99ac444 -r 5c93ac32ace1b7f61f6c95bba0a0fe04d6f85755 test/functional/test_admin_features.py --- a/test/functional/test_admin_features.py +++ b/test/functional/test_admin_features.py @@ -30,7 +30,7 @@ password=password, username='admin-user', webapp='galaxy', - referer='' ) + redirect='' ) if not username_taken: raise AssertionError, "The public name (%s) is already being used by another user, but no error was displayed" \ % 'admin-user' @@ -40,14 +40,14 @@ password=password, username='h', webapp='galaxy', - referer='' ) + redirect='' ) if not invalid_username: raise AssertionError, "The public name (%s) is is invalid, but no error was displayed" % username previously_created, username_taken, invalid_username = self.create_new_account_as_admin( email=email, password=password, username='regular-user3', webapp='galaxy', - referer='' ) + redirect='' ) # Get the user object for later tests global regular_user3 regular_user3 = get_user( email ) 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.