1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/fd33b522ceeb/ changeset: fd33b522ceeb user: greg date: 2012-04-18 22:20:17 summary: Add a running_functional_tests config setting. affected #: 4 files diff -r aa821d6fdb3b56779401993727521acb661c90e8 -r fd33b522ceebbd0866f060b7309b14f9571ae06e lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -212,6 +212,7 @@ amqp_config = {} for k, v in amqp_config: self.amqp[k] = v + self.running_functional_tests = string_as_bool( kwargs.get( 'running_functional_tests', False ) ) def __read_tool_job_config( self, global_conf_parser, section, key ): try: tool_runners_config = global_conf_parser.items( section ) diff -r aa821d6fdb3b56779401993727521acb661c90e8 -r fd33b522ceebbd0866f060b7309b14f9571ae06e lib/galaxy/tool_shed/migrate/check.py --- a/lib/galaxy/tool_shed/migrate/check.py +++ b/lib/galaxy/tool_shed/migrate/check.py @@ -21,7 +21,6 @@ def verify_tools( app, url, galaxy_config_file, engine_options={} ): # Check the value in the migrate_tools.version database table column to verify that the number is in # sync with the number of version scripts in ~/lib/galaxy/tools/migrate/versions. - running_functional_tests = galaxy_config_file.endswith( '.sample' ) dialect = ( url.split( ':', 1 ) )[0] try: egg = dialect_to_egg[ dialect ] @@ -55,7 +54,7 @@ config_arg = '' if os.path.abspath( os.path.join( os.getcwd(), 'universe_wsgi.ini' ) ) != galaxy_config_file: config_arg = ' -c %s' % galaxy_config_file.replace( os.path.abspath( os.getcwd() ), '.' ) - if not running_functional_tests: + if not app.config.running_functional_tests: # Automatically update the value of the migrate_tools.version database table column. cmd = 'sh manage_tools.sh%s upgrade' % config_arg proc = subprocess.Popen( args=cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) diff -r aa821d6fdb3b56779401993727521acb661c90e8 -r fd33b522ceebbd0866f060b7309b14f9571ae06e lib/galaxy/webapps/community/config.py --- a/lib/galaxy/webapps/community/config.py +++ b/lib/galaxy/webapps/community/config.py @@ -98,6 +98,7 @@ self.global_conf_parser = global_conf_parser if global_conf and "__file__" in global_conf: global_conf_parser.read(global_conf['__file__']) + self.running_functional_tests = string_as_bool( kwargs.get( 'running_functional_tests', False ) ) def get( self, key, default ): return self.config_dict.get( key, default ) def get_bool( self, key, default ): diff -r aa821d6fdb3b56779401993727521acb661c90e8 -r fd33b522ceebbd0866f060b7309b14f9571ae06e scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -275,6 +275,7 @@ library_import_dir = library_import_dir, user_library_import_dir = user_library_import_dir, global_conf = global_conf, + running_functional_tests=True, **kwargs ) log.info( "Embedded Universe application started" ) # ---- Run webserver ------------------------------------------------------ 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.