[next] telepathy-mission-control: Implement Contacts properly on SimulatedConnection, and fix tests

[Simon McVittie]

Module: telepathy-mission-control
Branch: next
Commit: b89f6fe0bcacef9340f633ab09b275122c6db644
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=b89f6fe0bcacef9340f633ab09b275122c6db644

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct  2 13:08:45 2013 +0100

Implement Contacts properly on SimulatedConnection, and fix tests

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69885
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
[Cherry-picked from commit 15510bd on master. -smcv]
Conflicts:
	tests/twisted/constants.py
	tests/twisted/mctest.py

---

 tests/twisted/account-manager/avatar-persist.py |    8 +--
 tests/twisted/account-manager/avatar-refresh.py |    6 +-
 tests/twisted/account-manager/irc.py            |   28 +++++--
 tests/twisted/account-manager/nickname.py       |    6 +-
 tests/twisted/constants.py                      |    5 +
 tests/twisted/mctest.py                         |   93 +++++++++++++++++++----
 6 files changed, 112 insertions(+), 34 deletions(-)

Diff:   http://cgit.freedesktop.org/telepathy/telepathy-mission-control/diff/?id=b89f6fe0bcacef9340f633ab09b275122c6db644