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

db tools: Refactor generate-fixtures/rebuild-test-database. 

So `generate-fixtures` only ever did 9 lines of code (really
3 lines of actual code) in its normal mode of operation.

But it was cluttered with lots of stuff that really only
happened when you called it with the `-force` option, which
was only invoked by `rebuild-test-database`.

Now we inline most of the code into `rebuild-test-database`.

And now `generate-fixtures` is simple (and doesn't support
a `-force` flag.
This commit is contained in:
Steve Howell 2020-04-21 23:39:46 +00:00 committed by Tim Abbott
parent 239474124e
commit 8c2f8c8bcc
2 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tools/rebuild-test-database
View File

@ -2,5 +2,37 @@
set -e set -e
set -x set -x
# This is a really simple wrapper script, pretty much for documenting clarity export DJANGO_SETTINGS_MODULE=zproject.test_settings
"$(dirname "$0")/../tools/setup/generate-fixtures" --force
create_template_database()
{
psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test << EOF
DROP DATABASE IF EXISTS zulip_test_template;
CREATE DATABASE zulip_test_template TEMPLATE zulip_test;
EOF
}
mkdir -p zerver/tests/fixtures
"$(dirname "$0")/../scripts/setup/terminate-psql-sessions" zulip zulip_test zulip_test_base zulip_test_template
psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test <<EOF
DROP DATABASE IF EXISTS zulip_test;
CREATE DATABASE zulip_test TEMPLATE zulip_test_base;
EOF
"$(dirname "$0")/../scripts/setup/flush-memcached"
./manage.py migrate --noinput
./manage.py get_migration_status --output="migration_status_test"
# This next line can be simplified to "-n0" once we fix our app (and tests) with 0 messages.
./manage.py populate_db --test-suite -n30 --threads=1 \
--huddles=0 --personals=0 --percent-huddles=0 --percent-personals=0
./manage.py dumpdata \
zerver.UserProfile zerver.Stream zerver.Recipient \
zerver.Subscription zerver.Message zerver.Huddle zerver.Realm \
zerver.UserMessage zerver.Client \
zerver.DefaultStream > zerver/tests/fixtures/messages.json
# create pristine template database, for fast fixture restoration after tests are run.
create_template_database

39
tools/setup/generate-fixtures
View File

@ -1,47 +1,14 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
export DJANGO_SETTINGS_MODULE=zproject.test_settings run()
create_template_database()
{ {
psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test << EOF
DROP DATABASE IF EXISTS zulip_test_template;
CREATE DATABASE zulip_test_template TEMPLATE zulip_test;
EOF
}
if [ "$1" != "--force" ]; then
"$(dirname "$0")/../../scripts/setup/terminate-psql-sessions" zulip zulip_test zulip_test_base zulip_test_template "$(dirname "$0")/../../scripts/setup/terminate-psql-sessions" zulip zulip_test zulip_test_base zulip_test_template
psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test << EOF psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test << EOF
DROP DATABASE IF EXISTS zulip_test; DROP DATABASE IF EXISTS zulip_test;
CREATE DATABASE zulip_test TEMPLATE zulip_test_template; CREATE DATABASE zulip_test TEMPLATE zulip_test_template;
EOF EOF
"$(dirname "$0")/../../scripts/setup/flush-memcached" "$(dirname "$0")/../../scripts/setup/flush-memcached"
exit 0 }
fi
mkdir -p zerver/tests/fixtures run
"$(dirname "$0")/../../scripts/setup/terminate-psql-sessions" zulip zulip_test zulip_test_base zulip_test_template
psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test <<EOF
DROP DATABASE IF EXISTS zulip_test;
CREATE DATABASE zulip_test TEMPLATE zulip_test_base;
EOF
"$(dirname "$0")/../../scripts/setup/flush-memcached"
./manage.py migrate --noinput
./manage.py get_migration_status --output="migration_status_test"
# This next line can be simplified to "-n0" once we fix our app (and tests) with 0 messages.
./manage.py populate_db --test-suite -n30 --threads=1 \
--huddles=0 --personals=0 --percent-huddles=0 --percent-personals=0
./manage.py dumpdata \
zerver.UserProfile zerver.Stream zerver.Recipient \
zerver.Subscription zerver.Message zerver.Huddle zerver.Realm \
zerver.UserMessage zerver.Client \
zerver.DefaultStream > zerver/tests/fixtures/messages.json
# create pristine template database, for fast fixture restoration after tests are run.
create_template_database