Cleanup of account tests with more mocking

evennia/accounts/tests.py

@@ -1,7 +1,8 @@
-from mock import Mock
+from mock import Mock, MagicMock
 from random import randint
 from unittest import TestCase
 
+from django.test import override_settings
 from evennia.accounts.accounts import AccountSessionHandler
 from evennia.accounts.accounts import DefaultAccount
 from evennia.server.session import Session
@@ -30,24 +31,24 @@ class TestAccountSessionHandler(TestCase):
 
         import evennia.server.sessionhandler
 
-        s1 = Session()
+        s1 = MagicMock()
         s1.logged_in = True
         s1.uid = self.account.uid
         evennia.server.sessionhandler.SESSIONS[s1.uid] = s1
 
-        s2 = Session()
+        s2 = MagicMock()
         s2.logged_in = True
         s2.uid = self.account.uid + 1
         evennia.server.sessionhandler.SESSIONS[s2.uid] = s2
 
-        s3 = Session()
+        s3 = MagicMock()
         s3.logged_in = False
         s3.uid = self.account.uid + 2
         evennia.server.sessionhandler.SESSIONS[s3.uid] = s3
 
-        self.assertEqual(self.handler.get(), [s1])
-        self.assertEqual(self.handler.get(self.account.uid), [s1])
-        self.assertEqual(self.handler.get(self.account.uid + 1), [])
+        self.assertEqual([s.uid for s in self.handler.get()], [s1.uid])
+        self.assertEqual([s.uid for s in [self.handler.get(self.account.uid)]], [s1.uid])
+        self.assertEqual([s.uid for s in self.handler.get(self.account.uid + 1)], [])
 
     def test_all(self):
         "Check all method"
@@ -62,9 +63,10 @@ class TestDefaultAccount(TestCase):
     "Check DefaultAccount class"
 
     def setUp(self):
-        self.s1 = Session()
+        self.s1 = MagicMock()
         self.s1.puppet = None
         self.s1.sessid = 0
+        self.s1.data_outj
 
     def tearDown(self):
         if hasattr(self, "account"):
@@ -142,10 +144,7 @@ class TestDefaultAccount(TestCase):
         self.s1.uid = account.uid
         evennia.server.sessionhandler.SESSIONS[self.s1.uid] = self.s1
 
-        self.s1.puppet = None
-        self.s1.logged_in = True
-        self.s1.data_out = Mock(return_value=None)
-
+        self.s1.data_out = MagicMock()
         obj = Mock()
         obj.access = Mock(return_value=False)
 
@@ -154,6 +153,7 @@ class TestDefaultAccount(TestCase):
         self.assertTrue(self.s1.data_out.call_args[1]['text'].startswith("You don't have permission to puppet"))
         self.assertIsNone(obj.at_post_puppet.call_args)
 
+    @override_settings(MULTISESSION_MODE=0)
     def test_puppet_object_joining_other_session(self):
         "Check puppet_object method called, joining other session"
 
@@ -165,15 +165,16 @@ class TestDefaultAccount(TestCase):
 
         self.s1.puppet = None
         self.s1.logged_in = True
-        self.s1.data_out = Mock(return_value=None)
+        self.s1.data_out = MagicMock()
 
         obj = Mock()
         obj.access = Mock(return_value=True)
         obj.account = account
+        obj.sessions.all = MagicMock(return_value=[self.s1])
 
         account.puppet_object(self.s1, obj)
         # works because django.conf.settings.MULTISESSION_MODE is not in (1, 3)
-        self.assertTrue(self.s1.data_out.call_args[1]['text'].endswith("from another of your sessions."))
+        self.assertTrue(self.s1.data_out.call_args[1]['text'].endswith("from another of your sessions.|n"))
         self.assertTrue(obj.at_post_puppet.call_args[1] == {})
 
     def test_puppet_object_already_puppeted(self):

evennia/prototypes/spawner.py

@@ -258,6 +258,7 @@ def prototype_from_object(obj):
     aliases = obj.aliases.get(return_list=True)
     if aliases:
         prot['aliases'] = aliases
+    from evennia import set_trace;set_trace()
     tags = [(tag.db_key, tag.db_category, tag.db_data)
             for tag in obj.tags.all(return_objs=True)]
     if tags: