GetContactAttributes() doesn't have 'Hold' arg any more

16 files changed, 37 insertions, 37 deletions

diff --git a/tests/twisted/caps/receive-jingle.py b/tests/twisted/caps/receive-jingle.py
index c35d0dbb8..a9671fdd4 100644
--- a/tests/twisted/caps/receive-jingle.py
+++ b/tests/twisted/caps/receive-jingle.py
@@ -39,7 +39,7 @@ def test(q, bus, conn, stream):
                 cs.CONN + '/contact-id': 'bob@foo.com',
                 },
             },
-            conn.Contacts.GetContactAttributes([bob], [cs.CONN_IFACE_CONTACT_CAPS], True))
+            conn.Contacts.GetContactAttributes([bob], [cs.CONN_IFACE_CONTACT_CAPS]))
 
     # send updated presence with Jingle audio/video caps info. we turn on both
     # audio and video at the same time to test that all of the capabilities are
@@ -97,7 +97,7 @@ def test(q, bus, conn, stream):
                 },
             },
             conn.Contacts.GetContactAttributes([bob],
-                [cs.CONN_IFACE_CONTACT_CAPS], True))
+                [cs.CONN_IFACE_CONTACT_CAPS]))
 
     # send updated presence without video support
     presence = make_presence('bob@foo.com/Foo', status='hello',
@@ -124,7 +124,7 @@ def test(q, bus, conn, stream):
                 },
             },
             conn.Contacts.GetContactAttributes([bob],
-                [cs.CONN_IFACE_CONTACT_CAPS], True))
+                [cs.CONN_IFACE_CONTACT_CAPS]))
 
     # go offline
     presence = make_presence('bob@foo.com/Foo', type='unavailable')
@@ -152,11 +152,11 @@ def test(q, bus, conn, stream):
                 },
             },
             conn.Contacts.GetContactAttributes([bob],
-                [cs.CONN_IFACE_CONTACT_CAPS], True))
+                [cs.CONN_IFACE_CONTACT_CAPS]))
 
     # What about a handle that's not valid?
     assertEquals({}, conn.Contacts.GetContactAttributes(
-        [31337], [cs.CONN_IFACE_CONTACT_CAPS], False))
+        [31337], [cs.CONN_IFACE_CONTACT_CAPS]))
 
 if __name__ == '__main__':
     exec_test(test)
diff --git a/tests/twisted/caps/tube-caps.py b/tests/twisted/caps/tube-caps.py
index 1ceb6f8b5..5601fb61f 100644
--- a/tests/twisted/caps/tube-caps.py
+++ b/tests/twisted/caps/tube-caps.py
@@ -139,7 +139,7 @@ def receive_caps(q, conn, stream, contact, contact_handle, features,
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [contact_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertSameElements(caps[contact_handle], caps_via_contacts_iface)
 
@@ -250,7 +250,7 @@ def advertise_caps(q, conn, stream, filters, expected_features, unexpected_featu
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertSameElements(caps[self_handle], caps_via_contacts_iface)
 
@@ -297,7 +297,7 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertEquals(caps[self_handle], caps_via_contacts_iface)
 
@@ -312,7 +312,7 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertEquals(caps[self_handle], caps_via_contacts_iface)
 
@@ -329,7 +329,7 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertEquals(caps[self_handle], caps_via_contacts_iface)
 
diff --git a/tests/twisted/caps_helper.py b/tests/twisted/caps_helper.py
index b5579a2e0..3052c9efa 100644
--- a/tests/twisted/caps_helper.py
+++ b/tests/twisted/caps_helper.py
@@ -316,7 +316,7 @@ def presence_and_disco(q, conn, stream, contact, disco,
     return h
 
 def get_contacts_capabilities_sync(conn, contacts):
-    h2asv = conn.Contacts.GetContactAttributes(contacts, [cs.CONN_IFACE_CONTACT_CAPS], False)
+    h2asv = conn.Contacts.GetContactAttributes(contacts, [cs.CONN_IFACE_CONTACT_CAPS])
     ret = {}
     for h in contacts:
         ret[h] = h2asv[h][cs.ATTR_CONTACT_CAPABILITIES]
diff --git a/tests/twisted/client-types.py b/tests/twisted/client-types.py
index 7becd11a4..c9ceca387 100644
--- a/tests/twisted/client-types.py
+++ b/tests/twisted/client-types.py
@@ -63,7 +63,7 @@ def contact_online(q, conn, stream, contact, identities,
         assertEquals([handle, types], event.args)
 
 def get_client_types(conn, handle):
-    h2asv = conn.Contacts.GetContactAttributes([handle], [cs.CONN_IFACE_CLIENT_TYPES], False)
+    h2asv = conn.Contacts.GetContactAttributes([handle], [cs.CONN_IFACE_CLIENT_TYPES])
     return h2asv[handle][cs.ATTR_CLIENT_TYPES]
 
 def test(q, bus, conn, stream):
@@ -239,7 +239,7 @@ def test2(q, bus, conn, stream):
              args=[handle, ['pc']])
 
     attrs = conn.Contacts.GetContactAttributes([handle],
-        [cs.CONN_IFACE_CLIENT_TYPES], False)
+        [cs.CONN_IFACE_CLIENT_TYPES])
     assertContains(handle, attrs)
     attr = cs.CONN_IFACE_CLIENT_TYPES + '/client-types'
     assertContains(attr, attrs[handle])
diff --git a/tests/twisted/file-transfer/ft-client-caps.py b/tests/twisted/file-transfer/ft-client-caps.py
index f8c65c940..396b10a97 100644
--- a/tests/twisted/file-transfer/ft-client-caps.py
+++ b/tests/twisted/file-transfer/ft-client-caps.py
@@ -112,7 +112,7 @@ def receive_caps(q, conn, stream, contact, contact_handle, features,
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [contact_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertSameElements(caps[contact_handle], caps_via_contacts_iface)
 
@@ -200,7 +200,7 @@ def advertise_caps(q, bus, conn, stream, filters, expected_features, unexpected_
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertSameElements(caps[self_handle], caps_via_contacts_iface)
 
@@ -236,7 +236,7 @@ def test_ft_caps_to_contact(q, bus, conn, stream):
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertEquals(caps[self_handle], caps_via_contacts_iface)
 
@@ -253,7 +253,7 @@ def test_ft_caps_to_contact(q, bus, conn, stream):
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertEquals(caps[self_handle], caps_via_contacts_iface)
 
@@ -272,7 +272,7 @@ def test_ft_caps_to_contact(q, bus, conn, stream):
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertEquals(caps[self_handle], caps_via_contacts_iface)
 
@@ -291,7 +291,7 @@ def test_ft_caps_to_contact(q, bus, conn, stream):
 
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
-            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assertEquals(caps[self_handle], caps_via_contacts_iface)
 
diff --git a/tests/twisted/file-transfer/test-caps-file-transfer.py b/tests/twisted/file-transfer/test-caps-file-transfer.py
index c7d6c9b30..da90a1e19 100644
--- a/tests/twisted/file-transfer/test-caps-file-transfer.py
+++ b/tests/twisted/file-transfer/test-caps-file-transfer.py
@@ -55,7 +55,7 @@ def test_ft_caps_from_contact(q, bus, conn, stream, contact, contact_handle, cli
     assert caps == basic_caps, caps
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
-            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [contact_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assert caps_via_contacts_iface == caps[contact_handle], \
                                     caps_via_contacts_iface
@@ -97,7 +97,7 @@ def test_ft_caps_from_contact(q, bus, conn, stream, contact, contact_handle, cli
     assert caps == generic_tubes_caps, caps
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
-            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [contact_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assert caps_via_contacts_iface == caps[contact_handle], \
                                     caps_via_contacts_iface
diff --git a/tests/twisted/jingle-share/jingleshareutils.py b/tests/twisted/jingle-share/jingleshareutils.py
index 21030dc4d..9e32a36f4 100644
--- a/tests/twisted/jingle-share/jingleshareutils.py
+++ b/tests/twisted/jingle-share/jingleshareutils.py
@@ -54,7 +54,7 @@ def test_ft_caps_from_contact(q, bus, conn, stream, contact, contact_handle, cli
     assert caps == basic_caps, caps
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
-            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [contact_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assert caps_via_contacts_iface == caps[contact_handle], \
                                     caps_via_contacts_iface
@@ -96,7 +96,7 @@ def test_ft_caps_from_contact(q, bus, conn, stream, contact, contact_handle, cli
     assert caps == generic_ft_caps, caps
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
-            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [contact_handle][cs.ATTR_CONTACT_CAPABILITIES]
     assert caps_via_contacts_iface == caps[contact_handle], \
                                     caps_via_contacts_iface
diff --git a/tests/twisted/jingle-share/test-caps-file-transfer.py b/tests/twisted/jingle-share/test-caps-file-transfer.py
index f3be084ed..0a8b7f344 100644
--- a/tests/twisted/jingle-share/test-caps-file-transfer.py
+++ b/tests/twisted/jingle-share/test-caps-file-transfer.py
@@ -55,7 +55,7 @@ def check_contact_caps(conn, handle, with_ft):
     assert caps == expected_caps, caps
     # check the Contacts interface give the same caps
     caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
-            [handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [handle], [cs.CONN_IFACE_CONTACT_CAPS]) \
             [handle][cs.ATTR_CONTACT_CAPABILITIES]
     assert caps_via_contacts_iface == caps[handle], \
         caps_via_contacts_iface
diff --git a/tests/twisted/presence/set-idempotence.py b/tests/twisted/presence/set-idempotence.py
index 02f519ef3..a4b9e9fac 100644
--- a/tests/twisted/presence/set-idempotence.py
+++ b/tests/twisted/presence/set-idempotence.py
@@ -22,7 +22,7 @@ def run_test(q, bus, conn, stream):
         EventPattern('dbus-signal', signal='PresencesChanged'),
         EventPattern('stream-presence'))
     assert simple_signal.args == [{1L: (3L, u'away',  u'gone')}]
-    assert conn.Contacts.GetContactAttributes([1], [cs.CONN_IFACE_SIMPLE_PRESENCE], False) == { 1L:
+    assert conn.Contacts.GetContactAttributes([1], [cs.CONN_IFACE_SIMPLE_PRESENCE]) == { 1L:
       { cs.CONN_IFACE_SIMPLE_PRESENCE + "/presence": (3L, u'away', u'gone'),
         cs.ATTR_CONTACT_ID:
             'test@localhost'}}
@@ -36,7 +36,7 @@ def run_test(q, bus, conn, stream):
     # Set presence a second time. Since this call is redundant, there should
     # be no PresencesChanged or <presence> sent to the server.
     conn.SimplePresence.SetPresence('away', 'gone')
-    assert conn.Contacts.GetContactAttributes([1], [cs.CONN_IFACE_SIMPLE_PRESENCE], False) == { 1L:
+    assert conn.Contacts.GetContactAttributes([1], [cs.CONN_IFACE_SIMPLE_PRESENCE]) == { 1L:
       { cs.CONN_IFACE_SIMPLE_PRESENCE + "/presence": (3L, u'away', u'gone'),
         cs.ATTR_CONTACT_ID:
             'test@localhost'}}
@@ -53,7 +53,7 @@ def run_test(q, bus, conn, stream):
     children = list(presence.stanza.elements())
     assert children[0].name == 'status'
     assert str(children[0]) == 'yo'
-    assert conn.Contacts.GetContactAttributes([1], [cs.CONN_IFACE_SIMPLE_PRESENCE], False) == { 1L:
+    assert conn.Contacts.GetContactAttributes([1], [cs.CONN_IFACE_SIMPLE_PRESENCE]) == { 1L:
       { cs.CONN_IFACE_SIMPLE_PRESENCE + "/presence": (2L, u'available', u'yo'),
         cs.ATTR_CONTACT_ID:
             'test@localhost'}}
@@ -66,7 +66,7 @@ def run_test(q, bus, conn, stream):
         EventPattern('dbus-signal', signal='PresencesChanged'),
         EventPattern('stream-presence'))
     assert simple_signal.args == [{1L: (2L, u'available',  u'')}]
-    assert conn.Contacts.GetContactAttributes([1], [cs.CONN_IFACE_SIMPLE_PRESENCE], False) == { 1L:
+    assert conn.Contacts.GetContactAttributes([1], [cs.CONN_IFACE_SIMPLE_PRESENCE]) == { 1L:
       { cs.CONN_IFACE_SIMPLE_PRESENCE + "/presence": (2L, u'available', u''),
         cs.ATTR_CONTACT_ID:
             'test@localhost'}}
diff --git a/tests/twisted/presence_helper.py b/tests/twisted/presence_helper.py
index 768963376..f480c58c9 100644
--- a/tests/twisted/presence_helper.py
+++ b/tests/twisted/presence_helper.py
@@ -1,7 +1,7 @@
 import constants as cs
 
 def get_contacts_presences_sync(conn, contacts):
-     h2asv = conn.Contacts.GetContactAttributes(contacts, [cs.CONN_IFACE_SIMPLE_PRESENCE], False)
+     h2asv = conn.Contacts.GetContactAttributes(contacts, [cs.CONN_IFACE_SIMPLE_PRESENCE])
      presences = {}
      for h in contacts:
          presences[h] = h2asv[h][cs.ATTR_PRESENCE]
diff --git a/tests/twisted/roster/groups.py b/tests/twisted/roster/groups.py
index 3225151a6..871e91570 100644
--- a/tests/twisted/roster/groups.py
+++ b/tests/twisted/roster/groups.py
@@ -116,7 +116,7 @@ def test(q, bus, conn, stream):
 
     # check that Amy's state is what we expected
     attrs = conn.Contacts.GetContactAttributes([amy],
-            [cs.CONN_IFACE_CONTACT_GROUPS], False)[amy]
+            [cs.CONN_IFACE_CONTACT_GROUPS])[amy]
     # make the group list order-independent
     attrs[cs.CONN_IFACE_CONTACT_GROUPS + '/groups'] = \
         set(attrs[cs.CONN_IFACE_CONTACT_GROUPS + '/groups'])
@@ -172,7 +172,7 @@ def test(q, bus, conn, stream):
     assertEquals({ cs.CONN_IFACE_CONTACT_GROUPS + '/groups': ['ladies'],
             cs.CONN + '/contact-id': 'amy@foo.com' },
         conn.Contacts.GetContactAttributes([amy],
-            [cs.CONN_IFACE_CONTACT_GROUPS], False)[amy])
+            [cs.CONN_IFACE_CONTACT_GROUPS])[amy])
 
     # Rename group 'ladies' to 'girls'
     call_async(q, conn.ContactGroups, 'RenameGroup', 'ladies', 'girls')
diff --git a/tests/twisted/roster/test-save-alias-to-roster.py b/tests/twisted/roster/test-save-alias-to-roster.py
index 0f67da0ae..eb9c4e751 100644
--- a/tests/twisted/roster/test-save-alias-to-roster.py
+++ b/tests/twisted/roster/test-save-alias-to-roster.py
@@ -91,7 +91,7 @@ def test(q, bus, conn, stream):
     q.expect('dbus-signal', signal='MembersChangedDetailed')
 
     # But if we ask for it, Gabble should probably send a PEP query.
-    h2asv = conn.Contacts.GetContactAttributes([handle], [cs.CONN_IFACE_ALIASING], False)
+    h2asv = conn.Contacts.GetContactAttributes([handle], [cs.CONN_IFACE_ALIASING])
     assertEquals(jid, h2asv[handle][cs.ATTR_ALIAS])
     event = q.expect('stream-iq', iq_type='get', query_ns=ns.PUBSUB, to=jid)
     nick = 'Constant Future'
diff --git a/tests/twisted/test-location.py b/tests/twisted/test-location.py
index 40fab225b..0f1f29cbc 100644
--- a/tests/twisted/test-location.py
+++ b/tests/twisted/test-location.py
@@ -18,7 +18,7 @@ import ns
 Rich_Presence_Access_Control_Type_Publish_List = 1
 
 def get_location(conn, contact):
-    h2asv = conn.Contacts.GetContactAttributes([contact], [cs.CONN_IFACE_LOCATION], False)
+    h2asv = conn.Contacts.GetContactAttributes([contact], [cs.CONN_IFACE_LOCATION])
     return h2asv[contact].get(cs.ATTR_LOCATION)
 
 def test(q, bus, conn, stream):
@@ -213,7 +213,7 @@ def test(q, bus, conn, stream):
 
     # check that Contacts interface supports location
     attributes = conn.Contacts.GetContactAttributes(
-        [bob_handle, charles_handle], [cs.CONN_IFACE_LOCATION], False)
+        [bob_handle, charles_handle], [cs.CONN_IFACE_LOCATION])
     assertLength(2, attributes)
     assertContains(bob_handle, attributes)
     assertContains(charles_handle, attributes)
diff --git a/tests/twisted/vcard/get-contact-info.py b/tests/twisted/vcard/get-contact-info.py
index f546c350f..c9542f47e 100644
--- a/tests/twisted/vcard/get-contact-info.py
+++ b/tests/twisted/vcard/get-contact-info.py
@@ -56,7 +56,7 @@ def test(q, bus, conn, stream):
                                   u'Exemplary Team']),
                    ]
     # The request should be satisfied from the cache.
-    h2asv = conn.Contacts.GetContactAttributes([handle], [cs.CONN_IFACE_CONTACT_INFO], False)
+    h2asv = conn.Contacts.GetContactAttributes([handle], [cs.CONN_IFACE_CONTACT_INFO])
     assertEquals(contact_info, h2asv[handle][cs.ATTR_CONTACT_INFO])
 
 if __name__ == '__main__':
diff --git a/tests/twisted/vcard/test-alias-message.py b/tests/twisted/vcard/test-alias-message.py
index 07f889bf2..b19776f04 100644
--- a/tests/twisted/vcard/test-alias-message.py
+++ b/tests/twisted/vcard/test-alias-message.py
@@ -15,7 +15,7 @@ import constants as cs
 import ns
 
 def get_aliases(conn, contacts):
-    h2asv = conn.Contacts.GetContactAttributes(contacts, [cs.CONN_IFACE_ALIASING], False)
+    h2asv = conn.Contacts.GetContactAttributes(contacts, [cs.CONN_IFACE_ALIASING])
     ret = {}
     for h in contacts:
         ret[h] = h2asv[h][cs.ATTR_ALIAS]
diff --git a/tests/twisted/vcard/test-avatar-tokens.py b/tests/twisted/vcard/test-avatar-tokens.py
index 281a733bc..e0f93a916 100644
--- a/tests/twisted/vcard/test-avatar-tokens.py
+++ b/tests/twisted/vcard/test-avatar-tokens.py
@@ -44,7 +44,7 @@ def test(q, bus, conn, stream):
     handles = conn.get_contact_handles_sync([
         'amy@foo.com', 'bob@foo.com', 'che@foo.com', 'daf@foo.com' ])
 
-    h2asv = conn.Contacts.GetContactAttributes(handles, [cs.CONN_IFACE_AVATARS], False)
+    h2asv = conn.Contacts.GetContactAttributes(handles, [cs.CONN_IFACE_AVATARS])
     assertEquals('SHA1SUM-FOR-AMY', h2asv[handles[0]][cs.ATTR_AVATAR_TOKEN])
     assertEquals('SHA1SUM-FOR-BOB', h2asv[handles[1]][cs.ATTR_AVATAR_TOKEN])
     assertEquals('', h2asv[handles[2]][cs.ATTR_AVATAR_TOKEN])