Travis cleanups

bin/travis-build

@@ -16,23 +16,30 @@ sudo apt-get update -qq
 sudo apt-get install solr-jetty postgresql-$PGVERSION
 
 # Don't require a password to access DB
-sudo sed -i -e 's/ident/trust/g' /etc/postgresql/$PGVERSION/main/pg_hba.conf
+#sudo sed -i -e 's/ident/trust/g' /etc/postgresql/$PGVERSION/main/pg_hba.conf
 
 sudo service postgresql reload
 
 pip install -r pip-requirements.txt --use-mirrors
 pip install -r pip-requirements-test.txt --use-mirrors
 
-psql -c 'CREATE DATABASE ckan_test;' -U postgres
-psql -c 'CREATE DATABASE ckan_test_datastore;' -U postgres
+# make users
+psql -u postgres -c "CREATE USER ckanuser WITH PASSWORD 'pass';"
+psql -u postgres -c "CREATE USER readonlyuser WITH PASSWORD 'pass';"
+
+# make databases
+psql -u postgres -c 'CREATE DATABASE ckan_test WITH OWNER ckanuser;'
+psql -u postgres -c 'CREATE DATABASE ckan_test_datastore WITH OWNER ckanuser;'
+# Check postgres version
+psql -U ckanuser ckan_test -c 'SELECT version();'
 
 python setup.py develop
 
-# Configure CKAN's configuration file
-sed -i -e 's/.*solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' test-core.ini
-sed -i -e 's/.*ckan\.site_id.*/ckan.site_id = travis_ci/' test-core.ini
-sed -i -e 's/^sqlalchemy.url.*/sqlalchemy.url = postgresql:\/\/postgres@\/ckan_test/' test-core.ini
-sed -i -e 's/.*datastore.write_url.*/ckan.datastore.write_url = postgresql:\/\/postgres@\/ckan_test_datastore/' test-core.ini
+### Configure CKAN's configuration file
+##sed -i -e 's/.*solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' test-core.ini
+##sed -i -e 's/.*ckan\.site_id.*/ckan.site_id = travis_ci/' test-core.ini
+##sed -i -e 's/^sqlalchemy.url.*/sqlalchemy.url = postgresql:\/\/postgres@\/ckan_test/' test-core.ini
+##sed -i -e 's/.*datastore.write_url.*/ckan.datastore.write_url = postgresql:\/\/postgres@\/ckan_test_datastore/' test-core.ini
 
 # Configure Solr
 echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty