paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move tools/generate-fixtures to tools/setup/.

Browse Source
This commit is contained in:
Umair Khan
2016-05-26 15:40:41 +05:00
parent 8335bd672f
commit d425e05a02
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/run-casper
View File

@@ -36,7 +36,7 @@ for file in args:
os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')) os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..'))
subprocess.check_call('tools/generate-fixtures') subprocess.check_call('tools/setup/generate-fixtures')
subprocess.check_call('tools/setup/generate-test-credentials') subprocess.check_call('tools/setup/generate-test-credentials')

2
tools/do-destroy-rebuild-test-database
View File

@@ -3,5 +3,5 @@ set -e
set -x set -x
# This is a really simple wrapper script, pretty much for documenting clarity # This is a really simple wrapper script, pretty much for documenting clarity
"`dirname "$0"`/../tools/generate-fixtures" --force "`dirname "$0"`/../tools/setup/generate-fixtures" --force

8
tools/generate-fixtures → tools/setup/generate-fixtures
View File

@@ -12,25 +12,25 @@ if [ "$template_grep_error_code" == "0" ]; then
if [ -e zerver/fixtures/migration-status ] && if [ -e zerver/fixtures/migration-status ] &&
cmp -s zerver/fixtures/available-migrations zerver/fixtures/migration-status && cmp -s zerver/fixtures/available-migrations zerver/fixtures/migration-status &&
[ "$1" != "--force" ]; then [ "$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 -h localhost postgres zulip_test << EOF psql -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
sh "$(dirname "$0")/../scripts/setup/flush-memcached" sh "$(dirname "$0")/../../scripts/setup/flush-memcached"
exit 0 exit 0
fi fi
fi fi
mkdir -p zerver/fixtures mkdir -p zerver/fixtures
"$(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 -h localhost postgres zulip_test <<EOF psql -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_base; CREATE DATABASE zulip_test TEMPLATE zulip_test_base;
EOF EOF
sh "$(dirname "$0")/../scripts/setup/flush-memcached" sh "$(dirname "$0")/../../scripts/setup/flush-memcached"
python manage.py migrate --noinput --settings=zproject.test_settings python manage.py migrate --noinput --settings=zproject.test_settings
migration_status "zerver/fixtures/migration-status" migration_status "zerver/fixtures/migration-status"

2
tools/test-backend
View File

@@ -43,7 +43,7 @@ if __name__ == "__main__":
prof = cProfile.Profile() prof = cProfile.Profile()
prof.enable() prof.enable()
subprocess.call(os.path.join(TOOLS_DIR, 'generate-fixtures')) subprocess.call(os.path.join(TOOLS_DIR, 'setup', 'generate-fixtures'))
TestRunner = get_runner(settings) TestRunner = get_runner(settings)
test_runner = TestRunner() test_runner = TestRunner()