paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 10:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change datetime.now() to timezone.now() in various tests.

Browse Source 
Good practice to use timezone-aware datetime objects unless there is a
reason to do otherwise.
This commit is contained in:
Rishi Gupta
2016-11-05 23:43:19 -07:00
committed by Tim Abbott
parent 9e6e1a1e69
commit 6e9e2cc05f
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/tests/test_messages.py
View File

@@ -4,6 +4,7 @@ from django.db.models import Q
from django.conf import settings
from django.http import HttpResponse
from django.test import TestCase, override_settings
from django.utils import timezone
from zerver.lib import bugdown
from zerver.decorator import JsonableError
from zerver.lib.test_runner import slow
@@ -441,9 +442,9 @@ class MessageDictTest(ZulipTestCase):
recipient=recipient,
subject='whatever',
content='whatever %d' % i,
pub_date=datetime.datetime.now(),
pub_date=timezone.now(),
sending_client=sending_client,
last_edit_time=datetime.datetime.now(),
last_edit_time=timezone.now(),
edit_history='[]'
)
message.save()
@@ -476,9 +477,9 @@ class MessageDictTest(ZulipTestCase):
recipient=recipient,
subject='whatever',
content='hello **world**',
pub_date=datetime.datetime.now(),
pub_date=timezone.now(),
sending_client=sending_client,
last_edit_time=datetime.datetime.now(),
last_edit_time=timezone.now(),
edit_history='[]'
)
message.save()

5
zerver/tests/test_presence.py
View File

@@ -3,6 +3,7 @@ from __future__ import absolute_import
from __future__ import print_function
from django.http import HttpResponse
from django.utils import timezone
from typing import Any, Dict
from zerver.lib.test_helpers import (
@@ -27,7 +28,7 @@ class ActivityTest(ZulipTestCase):
self.login("hamlet@zulip.com")
client, _ = Client.objects.get_or_create(name='website')
query = '/json/users/me/pointer'
last_visit = datetime.datetime.now()
last_visit = timezone.now()
count=150
for user_profile in UserProfile.objects.all():
UserActivity.objects.get_or_create(
@@ -133,7 +134,7 @@ class UserPresenceTests(ZulipTestCase):
def _simulate_mirror_activity_for_user(self, user_profile):
# type: (UserProfile) -> None
last_visit = datetime.datetime.now()
last_visit = timezone.now()
client = make_client('zephyr_mirror')
UserActivity.objects.get_or_create(

11
zerver/tests/test_retention.py
View File

@@ -3,6 +3,7 @@ from __future__ import absolute_import
import types
from datetime import datetime, timedelta
from django.utils import timezone
from zerver.lib.test_helpers import ZulipTestCase
from zerver.models import Message, Realm, Recipient, UserProfile
from zerver.lib.retention import get_expired_messages
@@ -63,12 +64,12 @@ class TestRetentionLib(ZulipTestCase):
# type: () -> None
# Check result realm messages order and result content
# when all realm has expired messages.
expired_mit_messages = self._make_mit_messages(3, datetime.now() - timedelta(days=101))
self._make_mit_messages(4, datetime.now() - timedelta(days=50))
expired_mit_messages = self._make_mit_messages(3, timezone.now() - timedelta(days=101))
self._make_mit_messages(4, timezone.now() - timedelta(days=50))
zulip_messages_ids = Message.objects.order_by('id').filter(
sender__realm=self.zulip_realm).values_list('id', flat=True)[3:10]
expired_zulip_messages = self._change_messages_pub_date(zulip_messages_ids,
datetime.now() - timedelta(days=31))
timezone.now() - timedelta(days=31))
# Iterate by result
expired_messages_result = [messages_list for messages_list in get_expired_messages()]
self.assertEqual(len(expired_messages_result), 2)
@@ -92,8 +93,8 @@ class TestRetentionLib(ZulipTestCase):
# type: () -> None
# Check realm with expired messages and messages
# with one day to expiration data.
expired_mit_messages = self._make_mit_messages(5, datetime.now() - timedelta(days=101))
actual_mit_messages = self._make_mit_messages(3, datetime.now() - timedelta(days=99))
expired_mit_messages = self._make_mit_messages(5, timezone.now() - timedelta(days=101))
actual_mit_messages = self._make_mit_messages(3, timezone.now() - timedelta(days=99))
expired_messages_result = list(get_expired_messages())
expired_mit_messages_ids = [message.id for message in expired_mit_messages]
expired_mit_messages_result_ids = [message.id for message in