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-11-17 01:49:51 -0500
commit69d430dd75f526984fd6ea6f9db294731698712c (patch)
treeb3e6a1eec56cde1633486cc91cf92bc2362b587c /tests
parent673545c7e48d86b02f811ad239ed317e4bca0bbc (diff)
downloadslixmpp-69d430dd75f526984fd6ea6f9db294731698712c.tar.gz
slixmpp-69d430dd75f526984fd6ea6f9db294731698712c.tar.bz2
slixmpp-69d430dd75f526984fd6ea6f9db294731698712c.tar.xz
slixmpp-69d430dd75f526984fd6ea6f9db294731698712c.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 8d043d5d..b8600b6a 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 8ca1c0e9..3e0933d7 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.recv("""
<presence from="user@localhost"
diff --git a/tests/test_stream_roster.py b/tests/test_stream_roster.py
index 8ffd86aa..7edaecd1 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',