paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 16:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[manual] Rename shakespeare users to zulip.com domain.

Browse Source 
We need to update our Nagios configuration when this is deployed.

(imported from commit 28cc3ecfe30c41562742733d6952c8e69b87d67e)
This commit is contained in:
Tim Abbott
2013-07-24 14:41:09 -04:00
parent f7be8a31ab
commit 77b0ddef78
10 changed files with 206 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servers/puppet/modules/humbug/files/nagios_plugins/check_send_receive_time
View File

@@ -88,16 +88,16 @@ def get_humbug(recipient, max_message_id):
if options.site == "staging.humbughq.com":
# hamlet and othello are default users on staging
sender = "hamlet@humbughq.com"
sender = "hamlet@zulip.com"
sender_key = "dfe1c934d555f4b9538d0d4cfd3069c2"
recipient = "othello@humbughq.com"
recipient = "othello@zulip.com"
recipient_key = "4e5d97591bec64bf57d2698ffbb563e3"
site = "https://staging.humbughq.com/api"
else:
# cordelia and iago are default users on prod
sender = "iago@humbughq.com"
sender = "iago@zulip.com"
sender_key = "d43b53c27a8106195b46781abc67901a"
recipient = "cordelia@humbughq.com"
recipient = "cordelia@zulip.com"
recipient_key = "24cf18de98d5c31da9c6c79f0cbec195"
site = "https://api.humbughq.com"

10
tools/stress-test/stress-test.coffee
View File

@@ -140,11 +140,11 @@ class HumbugSession extends Session
host = 'http://localhost:9991'
users = [
{username:'iago@humbughq.com', password: 'FlokrWdZefyEWkfI'}
{username: 'othello@humbughq.com', password: '52VeZqtHDCdAr5yM'}
{username: 'cordelia@humbughq.com', password: 'ZBldCWrQYEckMcaL'}
{username: 'hamlet@humbughq.com', password: 'qXqHrDf/UByuJQOb'}
{username: 'prospero@humbughq.com', password: 'GxInqKrm+2u06gfQ'}
{username: 'iago@zulip.com', password: 'JhwLkBydEG1tAL5P'}
{username: 'othello@zulip.com', password: 'GX5MTQ+qYSzcmDoH'}
{username: 'cordelia@zulip.com', password: '+1pkoQiP0wEbEvv/'}
{username: 'hamlet@zulip.com', password: 'Z/hx5nEcXRQBGzk3'}
{username: 'prospero@zulip.com', password: 'j+XqHkQ2cycwCQJE'}
]
user_start_step = 1000*1

10
zephyr/management/commands/populate_db.py
View File

@@ -122,9 +122,9 @@ class Command(BaseCommand):
# Create test Users (UserProfiles are automatically created,
# as are subscriptions to the ability to receive personals).
names = [("Othello, the Moor of Venice", "othello@humbughq.com"), ("Iago", "iago@humbughq.com"),
("Prospero from The Tempest", "prospero@humbughq.com"),
("Cordelia Lear", "cordelia@humbughq.com"), ("King Hamlet", "hamlet@humbughq.com")]
names = [("Othello, the Moor of Venice", "othello@zulip.com"), ("Iago", "iago@zulip.com"),
("Prospero from The Tempest", "prospero@zulip.com"),
("Cordelia Lear", "cordelia@zulip.com"), ("King Hamlet", "hamlet@zulip.com")]
for i in xrange(options["extra_users"]):
names.append(('Extra User %d' % (i,), 'extrauser%d@humbughq.com' % (i,)))
create_users(realms, names)
@@ -459,8 +459,8 @@ def restore_saved_messages():
if 'sending_client' in old_message:
message.sending_client = clients[old_message['sending_client']]
elif sender_email in ["othello@humbughq.com", "iago@humbughq.com", "prospero@humbughq.com",
"cordelia@humbughq.com", "hamlet@humbughq.com"]:
elif sender_email in ["othello@zulip.com", "iago@zulip.com", "prospero@zulip.com",
"cordelia@zulip.com", "hamlet@zulip.com"]:
message.sending_client = clients['populate_db']
elif realm.domain == "humbughq.com":
message.sending_client = clients["website"]

346
zephyr/tests.py
View File

File diff suppressed because it is too large Load Diff

2
zephyr/tests/frontend/common.js
View File

@@ -11,7 +11,7 @@ var last_send_or_update = -1;
function log_in(credentials) {
if (credentials === undefined) {
credentials = {username: 'iago@humbughq.com', password: 'FlokrWdZefyEWkfI'};
credentials = {username: 'iago@zulip.com', password: 'JhwLkBydEG1tAL5P'};
}
casper.test.info('Logging in');

8
zephyr/tests/frontend/tests/01-site.js
View File

@@ -46,13 +46,13 @@ common.send_many([
{ stream: 'Verona', subject: 'other subject',
content: 'test message C' },
{ recipient: 'cordelia@humbughq.com, hamlet@humbughq.com',
{ recipient: 'cordelia@zulip.com, hamlet@zulip.com',
content: 'personal A' },
{ recipient: 'cordelia@humbughq.com, hamlet@humbughq.com',
{ recipient: 'cordelia@zulip.com, hamlet@zulip.com',
content: 'personal B' },
{ recipient: 'cordelia@humbughq.com',
{ recipient: 'cordelia@zulip.com',
content: 'personal C' }]);
common.wait_for_receive(function () {
@@ -77,7 +77,7 @@ common.send_many([
{ stream: 'Verona', subject: 'frontend test',
content: 'test message D' },
{ recipient: 'cordelia@humbughq.com, hamlet@humbughq.com',
{ recipient: 'cordelia@zulip.com, hamlet@zulip.com',
content: 'personal D' }
]);

10
zephyr/tests/frontend/tests/02-narrow.js
View File

@@ -23,22 +23,22 @@ common.send_many([
{ stream: 'Venice', subject: 'frontend test',
content: 'other message' },
{ recipient: 'cordelia@humbughq.com, hamlet@humbughq.com',
{ recipient: 'cordelia@zulip.com, hamlet@zulip.com',
content: 'personal A' },
{ recipient: 'cordelia@humbughq.com, hamlet@humbughq.com',
{ recipient: 'cordelia@zulip.com, hamlet@zulip.com',
content: 'personal B' },
{ recipient: 'cordelia@humbughq.com',
{ recipient: 'cordelia@zulip.com',
content: 'personal C' },
{ stream: 'Verona', subject: 'frontend test',
content: 'test message D' },
{ recipient: 'cordelia@humbughq.com, hamlet@humbughq.com',
{ recipient: 'cordelia@zulip.com, hamlet@zulip.com',
content: 'personal D' },
{ recipient: 'cordelia@humbughq.com',
{ recipient: 'cordelia@zulip.com',
content: 'personal E' }
]);

4
zephyr/tests/frontend/tests/03-compose.js
View File

@@ -9,7 +9,7 @@ common.send_message('stream', {
content: "We reply to this message"
});
common.send_message('private', {
recipient: "cordelia@humbughq.com",
recipient: "cordelia@zulip.com",
content: "And reply to this message"
});
@@ -51,7 +51,7 @@ casper.waitUntilVisible('#stream', function () {
});
casper.waitUntilVisible('#private_message_recipient', function () {
common.check_form('#send_message_form', {recipient: "cordelia@humbughq.com"}, "Recipient populated after PM click");
common.check_form('#send_message_form', {recipient: "cordelia@zulip.com"}, "Recipient populated after PM click");
common.keypress(27); //escape
casper.page.sendEvent('keypress', 'k');

6
zephyr/tests/frontend/tests/05-settings.js
View File

@@ -25,7 +25,7 @@ casper.waitUntilVisible("#old_password", function () {
casper.fill(form_sel, {
"full_name": "IagoNew",
"old_password": "FlokrWdZefyEWkfI",
"old_password": "JhwLkBydEG1tAL5P",
"new_password": "qwertyuiop",
"confirm_password": "qwertyuiop"
});
@@ -52,8 +52,8 @@ casper.waitUntilVisible('#api_key_value', function () {
casper.fill(form_sel, {
"full_name": "Iago",
"old_password": "qwertyuiop",
"new_password": "FlokrWdZefyEWkfI",
"confirm_password": "FlokrWdZefyEWkfI"
"new_password": "JhwLkBydEG1tAL5P",
"confirm_password": "JhwLkBydEG1tAL5P"
});
casper.click('input[name="change_settings"]');
});

8
zephyr/tests/frontend/tests/06-unread.js
View File

@@ -25,7 +25,7 @@ common.then_log_out();
// Othello
casper.open("http://localhost:9981/accounts/login");
common.then_log_in({username: 'othello@humbughq.com', password: '52VeZqtHDCdAr5yM'});
common.then_log_in({username: 'othello@zulip.com', password: 'GX5MTQ+qYSzcmDoH'});
casper.then(function () {
// Force a pointer update so we no longer have a -1 pointer in the db
@@ -35,7 +35,7 @@ casper.then(function () {
});
common.then_log_out();
common.then_log_in({username: 'iago@humbughq.com', password: 'FlokrWdZefyEWkfI'});
common.then_log_in({username: 'iago@zulip.com', password: 'JhwLkBydEG1tAL5P'});
send_with_content('Iago unread test 1');
send_with_content('Iago unread test 2');
@@ -52,7 +52,7 @@ send_with_content('Iago unread test 12');
send_with_content('Iago unread test 13');
common.then_log_out();
common.then_log_in({username: 'othello@humbughq.com', password: '52VeZqtHDCdAr5yM'});
common.then_log_in({username: 'othello@zulip.com', password: 'GX5MTQ+qYSzcmDoH'});
casper.then(function () {
// Make sure we have 3 unread messages
casper.test.assertSelectorHasText("a[href='#narrow/stream/Verona']", 'Verona', 'Unread count in sidebar is correct');
@@ -98,7 +98,7 @@ casper.then(function () {
});
common.then_log_out();
common.then_log_in({username: 'othello@humbughq.com', password: '52VeZqtHDCdAr5yM'});
common.then_log_in({username: 'othello@zulip.com', password: 'GX5MTQ+qYSzcmDoH'});
casper.then(function () {
casper.test.assertSelectorHasText("a[href='#narrow/stream/Verona']", 'Verona', 'Sidebar unread correct on login');
});