mirror of
https://github.com/zulip/zulip.git
synced 2025-11-02 04:53:36 +00:00
fead14951c
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
85 lines
2.1 KiB
Python
85 lines
2.1 KiB
Python
from zerver.data_import.hipchat import (
|
|
get_hipchat_sender_id,
|
|
)
|
|
from zerver.data_import.hipchat_user import (
|
|
UserHandler,
|
|
)
|
|
from zerver.data_import.sequencer import (
|
|
IdMapper,
|
|
)
|
|
|
|
from zerver.lib.test_classes import (
|
|
ZulipTestCase,
|
|
)
|
|
from typing import Any, Dict
|
|
|
|
|
|
class HipChatImporter(ZulipTestCase):
|
|
def test_sender_ids(self) -> None:
|
|
realm_id = 5
|
|
user_handler = UserHandler()
|
|
|
|
user_id_mapper = IdMapper()
|
|
user_id_mapper.has = lambda key: True # type: ignore[assignment] # it's just a stub
|
|
|
|
# Simulate a "normal" user first.
|
|
user_with_id = dict(
|
|
id=1,
|
|
# other fields don't matter here
|
|
)
|
|
user_handler.add_user(user=user_with_id)
|
|
|
|
normal_message: Dict[str, Any] = dict(
|
|
sender=dict(
|
|
id=1,
|
|
)
|
|
)
|
|
|
|
sender_id = get_hipchat_sender_id(
|
|
realm_id=realm_id,
|
|
slim_mode=False,
|
|
message_dict=normal_message,
|
|
user_id_mapper=user_id_mapper,
|
|
user_handler=user_handler,
|
|
)
|
|
|
|
self.assertEqual(sender_id, 1)
|
|
|
|
bot_message = dict(
|
|
sender='fred_bot',
|
|
)
|
|
|
|
# Every message from fred_bot should
|
|
# return the same sender_id.
|
|
fred_bot_sender_id = 2
|
|
|
|
for i in range(3):
|
|
sender_id = get_hipchat_sender_id(
|
|
realm_id=realm_id,
|
|
slim_mode=False,
|
|
message_dict=bot_message,
|
|
user_id_mapper=user_id_mapper,
|
|
user_handler=user_handler,
|
|
)
|
|
|
|
self.assertEqual(sender_id, fred_bot_sender_id)
|
|
|
|
id_zero_message = dict(
|
|
sender=dict(
|
|
id=0,
|
|
name='hal_bot',
|
|
),
|
|
)
|
|
|
|
hal_bot_sender_id = 3
|
|
for i in range(3):
|
|
sender_id = get_hipchat_sender_id(
|
|
realm_id=realm_id,
|
|
slim_mode=False,
|
|
message_dict=id_zero_message,
|
|
user_id_mapper=user_id_mapper,
|
|
user_handler=user_handler,
|
|
)
|
|
|
|
self.assertEqual(sender_id, hal_bot_sender_id)
|