Applied patch from the old svn memorytest tree

[pymsnt] / src / legacy / msn / test_msn.py

diff --git a/src/legacy/msn/test_msn.py b/src/legacy/msn/test_msn.py
index b1548be1110ebd401c667e461f94b967c16a2585..fbfae5fc1c31e1f806f203493319ddc37807fe5e 100644 (file)
--- a/src/legacy/msn/test_msn.py
+++ b/src/legacy/msn/test_msn.py
@@ -569,11 +569,11 @@ class FakeNotificationClient(msn.NotificationClient):
         d = self.changePersonalMessage(personal)
         d.addCallback(testcb)
 
-    def doAvatarChange(self, data):
+    def doAvatarChange(self, dataFunc):
         def testcb(ignored):
             self.test = 'PASS'
             self.transport.loseConnection()
-        d = self.changeAvatar(data, True)
+        d = self.changeAvatar(dataFunc, True)
         d.addCallback(testcb)
 
     def doRequestSwitchboard(self):
@@ -650,7 +650,7 @@ class FakeServerNotificationTests(unittest.TestCase):
         self.failUnless((self.client.test == 'PASS'), 'Failed to change personal message properly')
 
     def testChangeAvatar(self):
-        self.client.doAvatarChange("DATADATADATADATA")
+        self.client.doAvatarChange(lambda: "DATADATADATADATA")
         self.failUnless(self.loop.doSteps(10), 'Failed to disconnect')
         self.failUnless((self.client.test == 'PASS'), 'Failed to change avatar properly')
 
@@ -1018,7 +1018,7 @@ class SwitchboardP2PTests(unittest.TestCase):
         # Set up the avatar for client1
         imageData = self._generateData()
         self.client1.msnobj = msn.MSNObject()
-        self.client1.msnobj.setData('foo1@bar.com', imageData)
+        self.client1.msnobj.setData('foo1@bar.com', lambda: imageData)
         self.client1.msnobj.makeText()
 
         # Make client2 request the avatar