summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-10-27 08:09:50 -0400
committerLance Stout <lancestout@gmail.com>2010-10-27 08:09:50 -0400
commitc6ed4b8a1d26e25c221d88052f23963ceeeb21ab (patch)
tree3c141088d076868022980b4c69a608a280146092 /tests
parent65aa6573df3a8f298e7df96473014c19216971ef (diff)
downloadslixmpp-c6ed4b8a1d26e25c221d88052f23963ceeeb21ab.tar.gz
slixmpp-c6ed4b8a1d26e25c221d88052f23963ceeeb21ab.tar.bz2
slixmpp-c6ed4b8a1d26e25c221d88052f23963ceeeb21ab.tar.xz
slixmpp-c6ed4b8a1d26e25c221d88052f23963ceeeb21ab.zip
Cleaned up names.
Diffstat (limited to 'tests')
-rw-r--r--tests/test_stanza_presence.py3
-rw-r--r--tests/test_stream_presence.py2
-rw-r--r--tests/test_stream_roster.py2
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_stanza_presence.py b/tests/test_stanza_presence.py
index 6a5a8b6e..1a7d44da 100644
--- a/tests/test_stanza_presence.py
+++ b/tests/test_stanza_presence.py
@@ -49,7 +49,8 @@ class TestPresenceStanzas(SleekTest):
self.failUnless(happened == [],
"changed_status event triggered for extra unavailable presence")
- self.failUnless(c.roster == {},
+ roster = c.roster['crap@wherever']
+ self.failUnless(roster['bill@chadmore.com'].resources == {},
"Roster updated for superfulous unavailable presence")
def testNickPlugin(self):
diff --git a/tests/test_stream_presence.py b/tests/test_stream_presence.py
index c873799a..b259495e 100644
--- a/tests/test_stream_presence.py
+++ b/tests/test_stream_presence.py
@@ -183,7 +183,7 @@ class TestStreamPresence(SleekTest):
presence_subscribe)
# With this setting we should reject all subscriptions.
- self.xmpp.rosters['tester@localhost'].auto_authorize = False
+ self.xmpp.roster['tester@localhost'].auto_authorize = False
self.stream_recv("""
<presence from="user@localhost"
diff --git a/tests/test_stream_roster.py b/tests/test_stream_roster.py
index 67da6e6c..f5617fb6 100644
--- a/tests/test_stream_roster.py
+++ b/tests/test_stream_roster.py
@@ -41,7 +41,7 @@ class TestStreamRoster(SleekTest):
# Wait for get_roster to return.
t.join()
- print self.xmpp.rosters['tester@localhost']['user@localhost']._state
+ print self.xmpp.roster['tester@localhost']['user@localhost']._state
self.check_roster('tester@localhost', 'user@localhost',
name='User',
subscription='from',