Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move available-migration and migration-status to var/.

This commit is contained in:
Taranjeet Singh 2016-07-24 10:59:42 +05:30 committed by Tim Abbott
parent b143d6ca6e
commit 1328a10069
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -8,8 +8,6 @@
*.DS_Store
event_queues.pickle
stats/
zerver/fixtures/available-migrations
zerver/fixtures/migration-status
zerver/fixtures/test_data1.json
.kdev4
.idea

6
tools/setup/generate-fixtures
View File

@ -8,9 +8,9 @@ function migration_status {
template_grep_error_code=$(echo "SELECT 1 from pg_database WHERE datname='zulip_test_template';" | python manage.py dbshell --settings=zproject.test_settings | grep -q "1 row"; echo $?)
if [ "$template_grep_error_code" == "0" ]; then
migration_status zerver/fixtures/available-migrations
migration_status var/available-migrations
if [ -e zerver/fixtures/migration-status ] &&
cmp -s zerver/fixtures/available-migrations zerver/fixtures/migration-status &&
cmp -s var/available-migrations var/migration-status &&
[ "$1" != "--force" ]; then
"$(dirname "$0")/../../scripts/setup/terminate-psql-sessions" zulip zulip_test zulip_test_base zulip_test_template
psql -h localhost postgres zulip_test << EOF
@ -33,7 +33,7 @@ EOF
sh "$(dirname "$0")/../../scripts/setup/flush-memcached"
python manage.py migrate --noinput --settings=zproject.test_settings
migration_status "zerver/fixtures/migration-status"
migration_status "var/migration-status"
# This next line can be simplified to "-n0" once we fix our app (and tests) with 0 messages.
python manage.py populate_db --settings=zproject.test_settings --test-suite -n30 \