From b5bb6b9921f743f981401044c3a80286508454c0 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 10 Oct 2012 18:10:48 -0400 Subject: [PATCH] Rename test-settings.py to test_settings.py (imported from commit c9ad55821bc66a7c11668ac0b40ca13c2e05986e) --- humbug/{test-settings.py => test_settings.py} | 0 tools/check-all | 2 +- zephyr/tests/generate-fixtures | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename humbug/{test-settings.py => test_settings.py} (100%) diff --git a/humbug/test-settings.py b/humbug/test_settings.py similarity index 100% rename from humbug/test-settings.py rename to humbug/test_settings.py diff --git a/tools/check-all b/tools/check-all index 86aeee033d..84a3cc8178 100755 --- a/tools/check-all +++ b/tools/check-all @@ -10,7 +10,7 @@ fi cd "$SCRIPT_DIR"/..; if git ls-files | grep py$ | grep -v ^confirmation/ \ - | grep -v humbug/test-settings.py \ + | grep -v humbug/test_settings.py \ | xargs pyflakes \ | grep -v 'imported but unused'; then diff --git a/zephyr/tests/generate-fixtures b/zephyr/tests/generate-fixtures index 9f26a4c98e..2afe780fd1 100755 --- a/zephyr/tests/generate-fixtures +++ b/zephyr/tests/generate-fixtures @@ -1,6 +1,6 @@ #!/bin/sh mkdir -p zephyr/fixtures rm -f zephyr/fixtures/zephyrdb.test -python manage.py syncdb --noinput --settings=humbug.test-settings -python manage.py populate_db --settings=humbug.test-settings -n20 -python manage.py dumpdata --settings=humbug.test-settings auth.User zephyr.UserProfile zephyr.Stream zephyr.Recipient zephyr.Subscription zephyr.Message zephyr.Huddle zephyr.Realm zephyr.UserMessage > zephyr/fixtures/messages.json +python manage.py syncdb --noinput --settings=humbug.test_settings +python manage.py populate_db --settings=humbug.test_settings -n20 +python manage.py dumpdata --settings=humbug.test_settings auth.User zephyr.UserProfile zephyr.Stream zephyr.Recipient zephyr.Subscription zephyr.Message zephyr.Huddle zephyr.Realm zephyr.UserMessage > zephyr/fixtures/messages.json