Fix DB test and upgrade to peewee 2.4.7, which has the delete instance fix

This commit is contained in:
Joseph Schorr 2015-02-09 11:10:26 -05:00
parent 09a10b6153
commit c081b1fa86
2 changed files with 3 additions and 3 deletions

View file

@ -38,7 +38,7 @@ marisa-trie==0.7
mixpanel-py==3.2.1 mixpanel-py==3.2.1
mock==1.0.1 mock==1.0.1
paramiko==1.15.2 paramiko==1.15.2
peewee==2.4.5 peewee==2.4.7
psycopg2==2.5.4 psycopg2==2.5.4
py-bcrypt==0.4 py-bcrypt==0.4
pycrypto==2.6.1 pycrypto==2.6.1

View file

@ -2,14 +2,14 @@ set -e
up_mysql() { up_mysql() {
# Run a SQL database on port 3306 inside of Docker. # Run a SQL database on port 3306 inside of Docker.
docker run --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password -d mysql docker run --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password -d mysql:5.7
# Sleep for 5s to get MySQL get started. # Sleep for 5s to get MySQL get started.
echo 'Sleeping for 10...' echo 'Sleeping for 10...'
sleep 10 sleep 10
# Add the database to mysql. # Add the database to mysql.
docker run --rm --link mysql:mysql mysql sh -c 'echo "create database genschema" | mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -ppassword' docker run --rm --link mysql:mysql mysql:5.7 sh -c 'echo "create database genschema" | mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -ppassword'
} }
down_mysql() { down_mysql() {