def __init__(self, con1, con2):
self.con1 = con1
self.con2 = con2
- self.con1ToCon2 = loopback.LoopbackRelay(con1)
- self.con2ToCon1 = loopback.LoopbackRelay(con2)
self.reconnect()
def reconnect(self):
+ self.con1ToCon2 = loopback.LoopbackRelay(self.con1)
+ self.con2ToCon1 = loopback.LoopbackRelay(self.con2)
self.con2.makeConnection(self.con1ToCon2)
self.con1.makeConnection(self.con2ToCon1)
self.connected = True
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):
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')
def _generateData(self):
data = ''
for i in xrange(3000):
- data += struct.pack("<L", random.randint(0, sys.maxint))
+ data += struct.pack("<L", random.randint(0, msn.MSN_MAXINT))
return data
def testAvatars(self):
# 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