[tracker/cuesheets: 6/18] Merge branch 'functional-test-improvements'

[Sam Thursfield <sthursfield src gnome org>]

commit f9001ce3e913a46065551e0b26585e6e2c3a6d86
Merge: 6f0f046 1c65a05
Author: Sam Thursfield <sam thursfield codethink co uk>
Date:   Thu Aug 25 11:47:34 2011 +0100

    Merge branch 'functional-test-improvements'

 tests/functional-tests/12-transactions.py          |    4 +-
 tests/functional-tests/17-ontology-changes.py      |    4 +-
 tests/functional-tests/200-backup-restore.py       |    6 -
 tests/functional-tests/300-miner-basic-ops.py      |   43 ++--
 tests/functional-tests/310-fts-indexing.py         |    7 +-
 tests/functional-tests/400-extractor.py            |    4 +
 tests/functional-tests/500-writeback.py            |    9 +-
 tests/functional-tests/501-writeback-details.py    |   10 +-
 tests/functional-tests/600-applications-camera.py  |    9 +-
 tests/functional-tests/601-applications-sync.py    |    5 +-
 .../common/utils/applicationstest.py               |   11 +-
 .../common/utils/configuration.py.in               |   13 +-
 tests/functional-tests/common/utils/dconf.py       |    3 +-
 tests/functional-tests/common/utils/helpers.py     |  346 ++++++++++++++++----
 tests/functional-tests/common/utils/minertest.py   |   18 +-
 tests/functional-tests/common/utils/options.py     |   17 +-
 tests/functional-tests/common/utils/storetest.py   |    3 +-
 tests/functional-tests/common/utils/system.py      |  297 +----------------
 .../functional-tests/common/utils/writebacktest.py |   17 +-
 tests/functional-tests/test-runner.sh              |   27 ++
 20 files changed, 422 insertions(+), 431 deletions(-)
---