python: Wrap long def lines in test files.

We don't have our linter checking test files due to ultra-long strings
that are often present in test output that we verify.  But it's worth
at least cleaning out all the ultra-long def lines.

zerver/tests/test_decorators.py

@@ -149,7 +149,8 @@ class DecoratorTestCase(TestCase):
     def test_REQ_validator(self) -> None:
 
         @has_request_variables
-        def get_total(request: HttpRequest, numbers: Iterable[int]=REQ(validator=check_list(check_int))) -> int:
+        def get_total(request: HttpRequest,
+                      numbers: Iterable[int]=REQ(validator=check_list(check_int))) -> int:
             return sum(numbers)
 
         class Request:
@@ -177,7 +178,8 @@ class DecoratorTestCase(TestCase):
 
     def test_REQ_argument_type(self) -> None:
         @has_request_variables
-        def get_payload(request: HttpRequest, payload: Dict[str, Any]=REQ(argument_type='body')) -> Dict[str, Any]:
+        def get_payload(request: HttpRequest,
+                        payload: Dict[str, Any]=REQ(argument_type='body')) -> Dict[str, Any]:
             return payload
 
         class MockRequest:
@@ -1136,7 +1138,7 @@ class TestRequireServerAdminDecorator(ZulipTestCase):
         self.assertEqual(result.status_code, 200)
 
 class ReturnSuccessOnHeadRequestDecorator(ZulipTestCase):
-    def test_return_success_on_head_request_returns_200_if_request_method_is_head(self) -> None:
+    def test_returns_200_if_request_method_is_head(self) -> None:
         class HeadRequest:
             method = 'HEAD'
 
@@ -1150,7 +1152,7 @@ class ReturnSuccessOnHeadRequestDecorator(ZulipTestCase):
         self.assert_json_success(response)
         self.assertNotEqual(ujson.loads(response.content).get('msg'), u'from_test_function')
 
-    def test_return_success_on_head_request_returns_normal_response_if_request_method_is_not_head(self) -> None:
+    def test_returns_normal_response_if_request_method_is_not_head(self) -> None:
             class HeadRequest:
                 method = 'POST'
 

zerver/tests/test_email_mirror.py

@@ -262,7 +262,8 @@ class TestEmptyGatewaySetting(ZulipTestCase):
 class TestDigestEmailMessages(ZulipTestCase):
     @mock.patch('zerver.lib.digest.enough_traffic')
     @mock.patch('zerver.lib.digest.send_future_email')
-    def test_receive_digest_email_messages(self, mock_send_future_email: mock.MagicMock, mock_enough_traffic: mock.MagicMock) -> None:
+    def test_receive_digest_email_messages(self, mock_send_future_email: mock.MagicMock,
+                                           mock_enough_traffic: mock.MagicMock) -> None:
 
         # build dummy messages for missed messages email reply
         # have Hamlet send Othello a PM. Othello will reply via email
@@ -284,8 +285,8 @@ class TestDigestEmailMessages(ZulipTestCase):
 
     @mock.patch('zerver.lib.digest.queue_digest_recipient')
     @mock.patch('zerver.lib.digest.timezone_now')
-    def test_inactive_users_queued_for_digest(self, mock_django_timezone: mock.MagicMock, mock_queue_digest_recipient: mock.MagicMock) -> None:
+    def test_inactive_users_queued_for_digest(self, mock_django_timezone: mock.MagicMock,
-
+                                              mock_queue_digest_recipient: mock.MagicMock) -> None:
         cutoff = timezone_now()
         # Test Tuesday
         mock_django_timezone.return_value = datetime.datetime(year=2016, month=1, day=5)
@@ -340,8 +341,8 @@ class TestDigestEmailMessages(ZulipTestCase):
 
     @mock.patch('zerver.lib.digest.queue_digest_recipient')
     @mock.patch('zerver.lib.digest.timezone_now')
-    def test_only_enqueue_on_valid_day(self, mock_django_timezone: mock.MagicMock, mock_queue_digest_recipient: mock.MagicMock) -> None:
+    def test_only_enqueue_on_valid_day(self, mock_django_timezone: mock.MagicMock,
-
+                                       mock_queue_digest_recipient: mock.MagicMock) -> None:
         # Not a Tuesday
         mock_django_timezone.return_value = datetime.datetime(year=2016, month=1, day=6)
 
@@ -352,8 +353,8 @@ class TestDigestEmailMessages(ZulipTestCase):
 
     @mock.patch('zerver.lib.digest.queue_digest_recipient')
     @mock.patch('zerver.lib.digest.timezone_now')
-    def test_no_email_digest_for_bots(self, mock_django_timezone: mock.MagicMock, mock_queue_digest_recipient: mock.MagicMock) -> None:
+    def test_no_email_digest_for_bots(self, mock_django_timezone: mock.MagicMock,
-
+                                      mock_queue_digest_recipient: mock.MagicMock) -> None:
         cutoff = timezone_now()
         # A Tuesday
         mock_django_timezone.return_value = datetime.datetime(year=2016, month=1, day=5)
@@ -519,7 +520,8 @@ class TestEmailMirrorTornadoView(ZulipTestCase):
         return create_missed_message_address(user_profile, user_message.message)
 
     @mock.patch('zerver.lib.email_mirror.queue_json_publish')
-    def send_offline_message(self, to_address: str, sender: str, mock_queue_json_publish: mock.Mock) -> HttpResponse:
+    def send_offline_message(self, to_address: str, sender: str,
+                             mock_queue_json_publish: mock.Mock) -> HttpResponse:
         template_path = os.path.join(MAILS_DIR, "simple.txt")
         with open(template_path) as template_file:
             mail_template = template_file.read()

zerver/tests/test_link_embed.py

@@ -194,7 +194,8 @@ class PreviewTestCase(ZulipTestCase):
         self.assertIn(embedded_link, msg.rendered_content)
 
     @override_settings(INLINE_URL_EMBED_PREVIEW=True)
-    def _send_message_with_test_org_url(self, sender_email: str, queue_should_run: bool=True, relative_url: bool=False) -> Message:
+    def _send_message_with_test_org_url(self, sender_email: str, queue_should_run: bool=True,
+                                        relative_url: bool=False) -> Message:
         url = 'http://test.org/'
         with mock.patch('zerver.lib.actions.queue_json_publish') as patched:
             msg_id = self.send_personal_message(

zerver/tests/test_management_commands.py

@@ -139,7 +139,8 @@ class TestSendWebhookFixtureMessage(TestCase):
         print_help_mock.assert_any_call('./manage.py', self.COMMAND_NAME)
 
     @patch('zerver.management.commands.send_webhook_fixture_message.os.path.exists')
-    def test_check_if_command_exits_when_fixture_path_does_not_exist(self, os_path_exists_mock: MagicMock) -> None:
+    def test_check_if_command_exits_when_fixture_path_does_not_exist(
+            self, os_path_exists_mock: MagicMock) -> None:
         os_path_exists_mock.return_value = False
 
         with self.assertRaises(SystemExit):

zerver/tests/test_message_edit_notifications.py

@@ -80,7 +80,8 @@ class EditMessageSideEffectsTest(ZulipTestCase):
 
         return message_id
 
-    def _get_queued_data_for_message_update(self, message_id: int, content: Text, expect_short_circuit: bool=False) -> Dict[str, Any]:
+    def _get_queued_data_for_message_update(self, message_id: int, content: Text,
+                                            expect_short_circuit: bool=False) -> Dict[str, Any]:
         '''
         This function updates a message with a post to
         /json/messages/(message_id).

zerver/tests/test_messages.py

@@ -1219,7 +1219,8 @@ class MessagePOSTTest(ZulipTestCase):
         self.assert_json_error(result, "User not authorized for this query")
 
     @mock.patch("zerver.views.messages.create_mirrored_message_users")
-    def test_send_message_create_mirrored_message_user_returns_invalid_input(self, create_mirrored_message_users_mock: Any) -> None:
+    def test_send_message_create_mirrored_message_user_returns_invalid_input(
+            self, create_mirrored_message_users_mock: Any) -> None:
         create_mirrored_message_users_mock.return_value = (False, True)
         self.login(self.mit_email("starnine"))
         result = self.client_post("/json/messages", {"type": "private",
@@ -1231,7 +1232,8 @@ class MessagePOSTTest(ZulipTestCase):
         self.assert_json_error(result, "Invalid mirrored message")
 
     @mock.patch("zerver.views.messages.create_mirrored_message_users")
-    def test_send_message_when_client_is_zephyr_mirror_but_string_id_is_not_zephyr(self, create_mirrored_message_users_mock: Any) -> None:
+    def test_send_message_when_client_is_zephyr_mirror_but_string_id_is_not_zephyr(
+            self, create_mirrored_message_users_mock: Any) -> None:
         create_mirrored_message_users_mock.return_value = (True, True)
         user = self.mit_user("starnine")
         email = user.email
@@ -1283,7 +1285,8 @@ class MessagePOSTTest(ZulipTestCase):
         self.assert_json_success(result)
 
 class EditMessageTest(ZulipTestCase):
-    def check_message(self, msg_id: int, subject: Optional[Text]=None, content: Optional[Text]=None) -> Message:
+    def check_message(self, msg_id: int, subject: Optional[Text]=None,
+                      content: Optional[Text]=None) -> Message:
         msg = Message.objects.get(id=msg_id)
         cached = MessageDict.wide_dict(msg)
         MessageDict.finalize_payload(cached, apply_markdown=False, client_gravatar=False)
@@ -1698,7 +1701,8 @@ class EditMessageTest(ZulipTestCase):
             else:
                 self.check_message(id_, subject=new_subject, content=new_content)
 
-        def do_edit_message_assert_error(id_: int, unique_str: Text, error: Text, topic_only: bool=False) -> None:
+        def do_edit_message_assert_error(id_: int, unique_str: Text, error: Text,
+                                         topic_only: bool=False) -> None:
             message = Message.objects.get(id=id_)
             old_subject = message.topic_name()
             old_content = message.content

zerver/tests/test_narrow.py

@@ -323,7 +323,8 @@ class NarrowBuilderTest(ZulipTestCase):
         query = self._build_query(term)
         self.assertEqual(str(query), 'SELECT id \nFROM zerver_message')
 
-    def _do_add_term_test(self, term: Dict[str, Any], where_clause: Text, params: Optional[Dict[str, Any]]=None) -> None:
+    def _do_add_term_test(self, term: Dict[str, Any], where_clause: Text,
+                          params: Optional[Dict[str, Any]]=None) -> None:
         query = self._build_query(term)
         if params is not None:
             actual_params = query.compile().params

zerver/tests/test_notifications.py

@@ -33,7 +33,8 @@ class TestMissedMessages(ZulipTestCase):
     def _get_tokens(self) -> List[str]:
         return [str(random.getrandbits(32)) for _ in range(30)]
 
-    def _test_cases(self, tokens: List[str], msg_id: int, body: str, subject: str, send_as_user: bool, verify_html_body: bool=False) -> None:
+    def _test_cases(self, tokens: List[str], msg_id: int, body: str, subject: str,
+                    send_as_user: bool, verify_html_body: bool=False) -> None:
         othello = self.example_user('othello')
         hamlet = self.example_user('hamlet')
         handle_missedmessage_emails(hamlet.id, [{'message_id': msg_id}])
@@ -57,7 +58,8 @@ class TestMissedMessages(ZulipTestCase):
             self.assertIn(body, self.normalize_string(msg.body))
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _extra_context_in_missed_stream_messages_mention(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _extra_context_in_missed_stream_messages_mention(self, send_as_user: bool,
+                                                         mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -74,7 +76,8 @@ class TestMissedMessages(ZulipTestCase):
         self._test_cases(tokens, msg_id, body, subject, send_as_user)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _extra_context_in_missed_stream_messages_mention_two_senders(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _extra_context_in_missed_stream_messages_mention_two_senders(
+            self, send_as_user: bool, mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -88,7 +91,8 @@ class TestMissedMessages(ZulipTestCase):
         self._test_cases(tokens, msg_id, body, subject, send_as_user)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _extra_context_in_personal_missed_stream_messages(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _extra_context_in_personal_missed_stream_messages(self, send_as_user: bool,
+                                                          mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -102,7 +106,8 @@ class TestMissedMessages(ZulipTestCase):
         self._test_cases(tokens, msg_id, body, subject, send_as_user)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _reply_to_email_in_personal_missed_stream_messages(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _reply_to_email_in_personal_missed_stream_messages(self, send_as_user: bool,
+                                                           mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -116,7 +121,8 @@ class TestMissedMessages(ZulipTestCase):
         self._test_cases(tokens, msg_id, body, subject, send_as_user)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _reply_warning_in_personal_missed_stream_messages(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _reply_warning_in_personal_missed_stream_messages(self, send_as_user: bool,
+                                                          mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -130,7 +136,8 @@ class TestMissedMessages(ZulipTestCase):
         self._test_cases(tokens, msg_id, body, subject, send_as_user)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _extra_context_in_huddle_missed_stream_messages_two_others(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _extra_context_in_huddle_missed_stream_messages_two_others(self, send_as_user: bool,
+                                                                   mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -149,7 +156,8 @@ class TestMissedMessages(ZulipTestCase):
         self._test_cases(tokens, msg_id, body, subject, send_as_user)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _extra_context_in_huddle_missed_stream_messages_three_others(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _extra_context_in_huddle_missed_stream_messages_three_others(self, send_as_user: bool,
+                                                                     mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -169,7 +177,8 @@ class TestMissedMessages(ZulipTestCase):
         self._test_cases(tokens, msg_id, body, subject, send_as_user)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _extra_context_in_huddle_missed_stream_messages_many_others(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _extra_context_in_huddle_missed_stream_messages_many_others(self, send_as_user: bool,
+                                                                    mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -186,7 +195,8 @@ class TestMissedMessages(ZulipTestCase):
         self._test_cases(tokens, msg_id, body, subject, send_as_user)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _deleted_message_in_missed_stream_messages(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _deleted_message_in_missed_stream_messages(self, send_as_user: bool,
+                                                   mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -204,7 +214,8 @@ class TestMissedMessages(ZulipTestCase):
         self.assertEqual(len(mail.outbox), 0)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _deleted_message_in_personal_missed_stream_messages(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _deleted_message_in_personal_missed_stream_messages(self, send_as_user: bool,
+                                                            mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 
@@ -222,7 +233,8 @@ class TestMissedMessages(ZulipTestCase):
         self.assertEqual(len(mail.outbox), 0)
 
     @patch('zerver.lib.email_mirror.generate_random_token')
-    def _deleted_message_in_huddle_missed_stream_messages(self, send_as_user: bool, mock_random_token: MagicMock) -> None:
+    def _deleted_message_in_huddle_missed_stream_messages(self, send_as_user: bool,
+                                                          mock_random_token: MagicMock) -> None:
         tokens = self._get_tokens()
         mock_random_token.side_effect = tokens
 

zerver/tests/test_outgoing_webhook_system.py

@@ -104,7 +104,8 @@ Time is up!
     @mock.patch('logging.exception')
     @mock.patch('requests.request', side_effect=request_exception_error)
     @mock.patch('zerver.lib.outgoing_webhook.fail_with_message')
-    def test_request_exception(self, mock_fail_with_message: mock.Mock, mock_requests_request: mock.Mock, mock_logger: mock.Mock) -> None:
+    def test_request_exception(self, mock_fail_with_message: mock.Mock,
+                               mock_requests_request: mock.Mock, mock_logger: mock.Mock) -> None:
         do_rest_call(self.rest_operation, None, self.mock_event, service_handler, None)
         bot_owner_notification = self.get_last_message()
         self.assertTrue(mock_fail_with_message.called)

zerver/tests/test_presence.py

@@ -279,7 +279,8 @@ class SingleUserPresenceTests(ZulipTestCase):
         self.assertEqual(result.json()['msg'], '')
 
 class UserPresenceAggregationTests(ZulipTestCase):
-    def _send_presence_for_aggregated_tests(self, email: str, status: str, validate_time: datetime.datetime) -> Dict[str, Dict[str, Any]]:
+    def _send_presence_for_aggregated_tests(self, email: str, status: str,
+                                            validate_time: datetime.datetime) -> Dict[str, Dict[str, Any]]:
         self.login(email)
         timezone_util = 'zerver.views.presence.timezone_now'
         with mock.patch(timezone_util, return_value=validate_time - datetime.timedelta(seconds=5)):

zerver/tests/test_realm.py

@@ -20,7 +20,8 @@ from zerver.lib.test_runner import slow
 from zerver.models import get_realm, Realm, UserProfile, ScheduledEmail, get_stream
 
 class RealmTest(ZulipTestCase):
-    def assert_user_profile_cache_gets_new_name(self, user_profile: UserProfile, new_realm_name: Text) -> None:
+    def assert_user_profile_cache_gets_new_name(self, user_profile: UserProfile,
+                                                new_realm_name: Text) -> None:
         self.assertEqual(user_profile.realm.name, new_realm_name)
 
     def test_do_set_realm_name_caching(self) -> None:

zerver/tests/test_signup.py

@@ -1692,8 +1692,10 @@ class UserSignUpTest(ZulipTestCase):
             group2_streams.append(stream)
         do_create_default_stream_group(realm, "group 2", "group 2 description", group2_streams)
 
-        result = self.submit_reg_form_for_user(email, password, default_stream_groups=["group 1", "group 2"])
+        result = self.submit_reg_form_for_user(email, password,
-        self.check_user_subscribed_only_to_streams("newguy", list(set(default_streams + group1_streams + group2_streams)))
+                                               default_stream_groups=["group 1", "group 2"])
+        self.check_user_subscribed_only_to_streams(
+            "newguy", list(set(default_streams + group1_streams + group2_streams)))
 
     def test_signup_invalid_subdomain(self):
         # type: () -> None

zerver/tests/test_subs.py

@@ -867,7 +867,8 @@ class DefaultStreamGroupTest(ZulipTestCase):
 
         # Test creating a default stream group which contains a default stream
         do_add_default_stream(remaining_streams[0])
-        with self.assertRaisesRegex(JsonableError, "'stream1' is a default stream and cannot be added to 'new group1'"):
+        with self.assertRaisesRegex(
+                JsonableError, "'stream1' is a default stream and cannot be added to 'new group1'"):
             do_create_default_stream_group(realm, new_group_name, "This is group1", remaining_streams)
 
     def test_api_calls(self) -> None:
@@ -938,7 +939,8 @@ class DefaultStreamGroupTest(ZulipTestCase):
 
         result = self.client_patch("/json/default_stream_groups/{}/streams".format(group_id),
                                    {"op": "add", "stream_names": ujson.dumps(new_stream_names)})
-        self.assert_json_error(result, "Stream 'stream4' is already present in default stream group 'group1'")
+        self.assert_json_error(result,
+                               "Stream 'stream4' is already present in default stream group 'group1'")
 
         # Test removing streams from default stream group
         result = self.client_patch("/json/default_stream_groups/12345/streams",
@@ -1741,7 +1743,8 @@ class SubscriptionAPITest(ZulipTestCase):
         self.assert_json_error(result,
                                "Invalid stream name '%s'" % (invalid_stream_name,))
 
-    def assert_adding_subscriptions_for_principal(self, invitee_email: Text, invitee_realm: Realm, streams: List[Text], invite_only: bool=False) -> None:
+    def assert_adding_subscriptions_for_principal(self, invitee_email: Text, invitee_realm: Realm,
+                                                  streams: List[Text], invite_only: bool=False) -> None:
         """
         Calling POST /json/users/me/subscriptions on behalf of another principal (for
         whom you have permission to add subscriptions) should successfully add

zerver/tests/test_type_debug.py

@@ -24,7 +24,8 @@ class TypesPrintTest(TestCase):
     def _post_teardown(self) -> None:
         pass
 
-    def check_signature(self, signature: str, retval: T, func: Callable[..., T], *args: Any, **kwargs: Any) -> None:
+    def check_signature(self, signature: str, retval: T, func: Callable[..., T],
+                        *args: Any, **kwargs: Any) -> None:
         """
         Checks if print_types outputs `signature` when func is called with *args and **kwargs.
         Do not decorate func with print_types before passing into this function.