From 6c6c955687994084d61d3a5fc61f525b44d87ad2 Mon Sep 17 00:00:00 2001 From: tobes Date: Fri, 1 Mar 2013 15:02:16 +0000 Subject: [PATCH] [#517] First try on a separate testing db --- .travis.yml | 16 ++++++++-------- bin/osx-postgres-mem.sh | 1 + doc/install-from-source.rst | 4 ++++ test-core.ini | 6 +++++- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index cef986ccb7f..781d1bf0826 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,21 +9,21 @@ install: - "pip install -r pip-requirements.txt --use-mirrors" - "pip install -r pip-requirements-test.txt --use-mirrors" before_script: - - psql -c 'CREATE DATABASE ckantest;' -U postgres + - psql -c 'CREATE DATABASE ckantesting;' -U postgres - psql -c 'CREATE DATABASE datastore;' -U postgres - psql -c 'CREATE USER readonlyuser;' -U postgres - python setup.py develop - paster make-config ckan development.ini --no-interactive - - sed -i -e 's/.*solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' development.ini - - sed -i -e 's/.*ckan\.site_id.*/ckan.site_id = travis_ci/' development.ini - - sed -i -e 's/^sqlalchemy.url.*/sqlalchemy.url = postgresql:\/\/postgres@localhost\/ckantest/' development.ini - - sed -i -e 's/.*datastore.write_url.*/ckan.datastore.write_url = postgresql:\/\/postgres@localhost\/datastore/' development.ini - - sed -i -e 's/.*datastore.read_url.*/ckan.datastore.read_url = postgresql:\/\/readonlyuser@localhost\/datastore/' development.ini - - cat development.ini + # - sed -i -e 's/.*solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' development.ini + # - sed -i -e 's/.*ckan\.site_id.*/ckan.site_id = travis_ci/' development.ini + # - sed -i -e 's/^sqlalchemy.url.*/sqlalchemy.url = postgresql:\/\/postgres@localhost\/ckantest/' development.ini + # - sed -i -e 's/.*datastore.write_url.*/ckan.datastore.write_url = postgresql:\/\/postgres@localhost\/datastore/' development.ini + # - sed -i -e 's/.*datastore.read_url.*/ckan.datastore.read_url = postgresql:\/\/readonlyuser@localhost\/datastore/' development.ini + # - cat development.ini - echo -e "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty - sudo cp ckan/config/solr/schema-2.0.xml /etc/solr/conf/schema.xml - sudo service jetty restart - - paster --plugin=ckan db init + - paster db init -c test-core.ini - paster datastore set-permissions postgres script: "nosetests --ckan --with-pylons=test-core.ini --nologcapture ckan ckanext" notifications: diff --git a/bin/osx-postgres-mem.sh b/bin/osx-postgres-mem.sh index 75664b7a741..5c6d9caa9ec 100755 --- a/bin/osx-postgres-mem.sh +++ b/bin/osx-postgres-mem.sh @@ -14,6 +14,7 @@ case $1 in ${PGCTL} -D ${PGDATA} start sleep 2; psql -c "CREATE DATABASE ckantest;" postgres + psql -c "CREATE DATABASE ckantesting;" postgres ;; stop) ## stop postgres diff --git a/doc/install-from-source.rst b/doc/install-from-source.rst index 2475503c1b8..8994b9364e5 100644 --- a/doc/install-from-source.rst +++ b/doc/install-from-source.rst @@ -104,6 +104,10 @@ Create the database (owned by ``ckanuser``), which we'll call ``ckantest``:: sudo -u postgres createdb -O ckanuser ckantest -E utf-8 +If you are planning to run the test then create a database for them too:: + + sudo -u postgres createdb -O ckanuser ckantesting -E utf-8 + 4. Create a CKAN config file ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/test-core.ini b/test-core.ini index d4372d234c2..2a73718977c 100644 --- a/test-core.ini +++ b/test-core.ini @@ -11,8 +11,12 @@ port = 5000 use = config:development.ini debug = false -#faster_db_test_hacks = True +# Specify the database for SQLAlchemy to use: +# * Postgres is currently required for a production CKAN deployment +# * Sqlite (memory or file) can be used as a quick alternative for testing +sqlalchemy.url = postgresql://ckanuser:pass@localhost/ckantesting #sqlalchemy.url = sqlite:/// +#sqlalchemy.url = sqlite:///%(here)s/somedb.db ckan.auth.user_create_organizations = true ckan.auth.user_create_groups = true