From e556c5e5d3d0ea9d5d856c08269c650859667c0b Mon Sep 17 00:00:00 2001
From: Vincent Le Goff <vincent.legoff.srs@gmail.com>
Date: Mon, 27 Feb 2017 16:51:35 -0800
Subject: [PATCH] Fix #1234: use a mock datetime class to force UTC

---
 evennia/contrib/tests.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index 53d1aa8f71..f831489fb9 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -4,6 +4,7 @@ Testing suite for contrib folder
 
 """
 
+import datetime
 from evennia.commands.default.tests import CommandTest
 from evennia.utils.test_resources import EvenniaTest
 from mock import Mock, patch
@@ -173,6 +174,16 @@ from evennia.contrib import extended_room
 from evennia import gametime
 from evennia.objects.objects import DefaultRoom
 
+class ForceUTCDatetime(datetime.datetime):
+
+    """Force UTC datetime."""
+
+    @classmethod
+    def fromtimestamp(cls, timestamp):
+        """Force fromtimestamp to run with naive datetimes."""
+        return datetime.datetime.utcfromtimestamp(timestamp)
+
+@patch('evennia.contrib.extended_room.datetime.datetime', ForceUTCDatetime)
 class TestExtendedRoom(CommandTest):
     room_typeclass = extended_room.ExtendedRoom
     DETAIL_DESC = "A test detail."