[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-testing

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    servicetest.py: remove Telepathy prefix from D-Bus signal path

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    BaseXmlStream: don't set SID; let Twisted do it for us

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    servicetest.py: add match() decorator for convenience

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    tests: use Event objects rather than tuples for representing events

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    fix stream version numbers to be tuples rather than strings

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    test-avatar-async.py: use data['conn_iface'] instead of conn_iface(data['conn'])

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename Authenticator to JabberAuthenticator

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    split XmlStream into JabberXmlStream and XmppXmlStream
Also: make XmlStreamFactory instantiate self.protocol instead of XmlStream,
and set XmlStreamFactory.protocol to JabberXmlStream.

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    test authenticator: specifically wait for jabber:iq:auth IQ

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    clarify comment

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    port tests to matching by event attribute instead of index

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    JabberAuthenticator: take username/password rather than username/digest

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    JabberXmlStream: only send header once stream is started, not when connection is made

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    test-avatar.py: use @match

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    gabbletest.py: remove unused code

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    simplify test setup code by building data dict after instantiating everything

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    gabbletest.py: add XMPP 1.0 authenticator

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    test-connect.py: use @match