[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-testing

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    gabbletest.py/servicetest.py: pass in bus to prepare_test rather than creating it there

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

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    gabbletest.py: factor out colouring code

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    port test-vcard-cache.py to new test API

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    gabbletest.py: split prepare_test into make_connection and make_stream

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    gabbletest.py: simplify verbosity logic

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    port test-caps-update.py to new test API

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    servicetest.py: rename prepare_test to make_connection