1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/24452bb4c6aa/ Changeset: 24452bb4c6aa User: natefoo Date: 2014-09-16 16:13:08 Summary: Fix unit tests I broke. Affected #: 3 files diff -r 898a4bda231824bc0453d5e593e0b86a9e1004e9 -r 24452bb4c6aa1a77a5d9d55fd76c2c43d47dcb9e buildbot_setup.sh --- a/buildbot_setup.sh +++ b/buildbot_setup.sh @@ -107,7 +107,7 @@ done echo "Copying job_conf.xml.sample_basic to job_conf.xml" -cp job_conf.xml.sample_basic job_conf.xml +cp config/job_conf.xml.sample_basic config/job_conf.xml for dir in $DIRS; do if [ ! -d $dir ]; then diff -r 898a4bda231824bc0453d5e593e0b86a9e1004e9 -r 24452bb4c6aa1a77a5d9d55fd76c2c43d47dcb9e lib/galaxy/model/orm/scripts.py --- a/lib/galaxy/model/orm/scripts.py +++ b/lib/galaxy/model/orm/scripts.py @@ -18,7 +18,7 @@ log = logging.getLogger( __name__ ) -DEFAULT_CONFIG_FILE = 'config/galaxy.ini' +DEFAULT_CONFIG_FILE = 'galaxy.ini' DEFAULT_CONFIG_PREFIX = '' DEFAULT_DATABASE = 'galaxy' diff -r 898a4bda231824bc0453d5e593e0b86a9e1004e9 -r 24452bb4c6aa1a77a5d9d55fd76c2c43d47dcb9e test/unit/jobs/test_job_configuration.py --- a/test/unit/jobs/test_job_configuration.py +++ b/test/unit/jobs/test_job_configuration.py @@ -9,8 +9,8 @@ # File would be slightly more readable if contents were embedded directly, but # there are advantages to testing the documentation/examples. -SIMPLE_JOB_CONF = os.path.join( os.path.dirname( __file__ ), "..", "..", "..", "job_conf.xml.sample_basic" ) -ADVANCED_JOB_CONF = os.path.join( os.path.dirname( __file__ ), "..", "..", "..", "job_conf.xml.sample_advanced" ) +SIMPLE_JOB_CONF = os.path.join( os.path.dirname( __file__ ), "..", "..", "..", "config", "job_conf.xml.sample_basic" ) +ADVANCED_JOB_CONF = os.path.join( os.path.dirname( __file__ ), "..", "..", "..", "config", "job_conf.xml.sample_advanced" ) class JobConfXmlParserTestCase( unittest.TestCase ): 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.