[next] telepathy-salut: Sync constants, servicetest with MC's 'next' version

[Simon McVittie]

Module: telepathy-salut
Branch: next
Commit: 0d0e1efdb220f9d7e77d23fe465bf168a3bec3b0
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=0d0e1efdb220f9d7e77d23fe465bf168a3bec3b0

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 26 19:21:31 2013 +0100

Sync constants, servicetest with MC's 'next' version

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69854
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 tests/twisted/constants.py   |  120 +++++++++++++-------
 tests/twisted/servicetest.py |  249 ++++++++++++++++++++++++++++++++++++++----
 2 files changed, 307 insertions(+), 62 deletions(-)

Diff:   http://cgit.freedesktop.org/telepathy/telepathy-salut/diff/?id=0d0e1efdb220f9d7e77d23fe465bf168a3bec3b0