Merge branch 'develop' into roster

This commit is contained in:
Lance Stout 2011-05-25 15:53:24 -07:00
commit 62bdaab7c7

View file

@ -132,7 +132,7 @@ class TestStreamRoster(SleekTest):
# Since get_roster blocks, we need to run it in a thread. # Since get_roster blocks, we need to run it in a thread.
t = threading.Thread(name='get_roster', t = threading.Thread(name='get_roster',
target=self.xmpp.get_roster, target=self.xmpp.get_roster,
kwargs={'callback': roster_callback}) kwargs={str('callback'): roster_callback})
t.start() t.start()
self.send(""" self.send("""