From 2db6dc6c88310d0a8f05de6cd9ea932d7260514e Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 6 Aug 2013 16:19:25 -0400 Subject: [PATCH] Change humbug => zulip in populate_db variables. (imported from commit 14f8e072fd87478e8877925912fde113a75aba2c) --- humbug/settings.py | 2 +- zerver/management/commands/populate_db.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/humbug/settings.py b/humbug/settings.py index 34568a873f..d94a531661 100644 --- a/humbug/settings.py +++ b/humbug/settings.py @@ -56,7 +56,7 @@ if not DEPLOYED: 'HOST': 'localhost', 'OPTIONS': {} }) - INTERNAL_HUMBUG_USERS = [] + INTERNAL_ZULIP_USERS = [] # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name diff --git a/zerver/management/commands/populate_db.py b/zerver/management/commands/populate_db.py index e481ba2370..7e2d1bcb4f 100644 --- a/zerver/management/commands/populate_db.py +++ b/zerver/management/commands/populate_db.py @@ -191,13 +191,13 @@ class Command(BaseCommand): # These bots are directly referenced from code and thus # are needed for the test suite. - hardcoded_humbug_users_nosubs = [ + hardcoded_zulip_users_nosubs = [ ("Zulip New User Bot", "new-user-bot@zulip.com"), ("Zulip Error Bot", "error-bot@zulip.com"), ("Zulip Notification Bot", "notification-bot@zulip.com"), ("Zulip Tutorial Bot", "tutorial-bot@zulip.com"), ] - create_users(realms, hardcoded_humbug_users_nosubs) + create_users(realms, hardcoded_zulip_users_nosubs) if not options["test_suite"]: # To keep the messages.json fixtures file for the test @@ -207,10 +207,10 @@ class Command(BaseCommand): internal_mit_users = [] create_users(realms, internal_mit_users) - create_users(realms, settings.INTERNAL_HUMBUG_USERS) - humbug_stream_list = ["devel", "all", "humbug", "design", "support", "social", "test", + create_users(realms, settings.INTERNAL_ZULIP_USERS) + zulip_stream_list = ["devel", "all", "zulip", "design", "support", "social", "test", "errors", "sales"] - create_streams(realms, zulip_realm, humbug_stream_list) + create_streams(realms, zulip_realm, zulip_stream_list) # Add a few default streams for stream_name in ["design", "devel", "social", "support"]: @@ -219,7 +219,7 @@ class Command(BaseCommand): # Now subscribe everyone to these streams subscriptions_to_add = [] profiles = UserProfile.objects.select_related().filter(realm=zulip_realm) - for cls in humbug_stream_list: + for cls in zulip_stream_list: stream = Stream.objects.get(name=cls, realm=zulip_realm) recipient = Recipient.objects.get(type=Recipient.STREAM, type_id=stream.id) for profile in profiles: @@ -229,13 +229,13 @@ class Command(BaseCommand): Subscription.objects.bulk_create(subscriptions_to_add) # These bots are not needed by the test suite - internal_humbug_users_nosubs = [ + internal_zulip_users_nosubs = [ ("Zulip Commit Bot", "commit-bot@zulip.com"), ("Zulip Trac Bot", "trac-bot@zulip.com"), ("Zulip Nagios Bot", "nagios-bot@zulip.com"), ("Zulip Feedback Bot", "feedback@zulip.com"), ] - create_users(realms, internal_humbug_users_nosubs) + create_users(realms, internal_zulip_users_nosubs) # Mark all messages as read with transaction.commit_on_success():