[next] telepathy-mission-control: avatar-refresh test: subsume avatar-persist, and test more situations

[Simon McVittie]

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

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

avatar-refresh test: subsume avatar-persist, and test more situations

We have some sort of combinatorial explosion going on here, and it
seems best to test it in a somewhat systematic way:

* is the protocol one where avatars persist on the server (Gabble)
  or not (Salut)?
* if it's like Gabble, does it download our own avatar token
  before signalling CONNECTED (as I suspect Haze does), or
  on-demand after GetKnownAvatarTokens (as Gabble appears to)?
* if it's like Gabble, is the server storing an avatar for us?
* in either case, do we have an avatar stored locally, and has
  it previously been uploaded or not?

In addition, the avatar-refresh and avatar-persist tests exercised
migration from ~/.missioncontrol and a low-priority XDG_DATA_DIRS entry
(respectively) to ~/.local/share. I didn't do that in a loop, because
it isn't applicable in all cases and would lead to even more
combinations - testing each case once should be enough.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69885
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
[cherry-picked from master commit d780671 plus the test part of
4f4ed24, adjusted for old constant naming and to replace
unforbid_all() with unforbid_events() -smcv]
Conflicts:
	tests/twisted/account-manager/avatar-persist.py
	tests/twisted/account-manager/avatar-refresh.py

---

 tests/twisted/Makefile.am                       |    1 -
 tests/twisted/account-manager/avatar-persist.py |  181 -----------
 tests/twisted/account-manager/avatar-refresh.py |  390 ++++++++++++++++++-----
 tests/twisted/mctest.py                         |   41 ++-
 4 files changed, 350 insertions(+), 263 deletions(-)

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