[tracker/harmattan-pre-signal-updates: 1128/1380] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit 38cfb8f43d4c0dd36eacd4d8e0cd543723e75f5c
Merge: 71235cd 96d0890
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Aug 18 18:02:32 2010 +0100

    Merge branch 'master' into harmattan

 Makefile.am                                        |    3 +
 configure.ac                                       |   23 +-
 src/tracker-extract/tracker-extract-mp3.c          |    4 +
 tests/functional-tests/01-insertion.py             | 1108 +++----
 tests/functional-tests/02-metacontacts.py          |  165 -
 tests/functional-tests/03-fts-functions.py         |   36 +-
 tests/functional-tests/04-group-concat.py          |   35 +-
 tests/functional-tests/05-coalesce.py              |   37 +-
 tests/functional-tests/06-distance.py              |   32 +-
 tests/functional-tests/07-graph.py                 |   36 +-
 tests/functional-tests/08-unique-insertions.py     |   41 +-
 tests/functional-tests/09-concurrent-query.py      |   47 +-
 tests/functional-tests/10-sqlite-misused.py        |   44 +-
 tests/functional-tests/11-sqlite-batch-misused.py  |   40 +-
 tests/functional-tests/12-transactions.py          |  111 +-
 tests/functional-tests/13-threaded-store.py        |  145 +
 tests/functional-tests/14-signals.py               |  171 +
 tests/functional-tests/200-backup-restore.py       |  401 +++
 tests/functional-tests/300-miner-basic-ops.py      |  275 ++
 tests/functional-tests/310-fts-indexing.py         |  308 ++
 tests/functional-tests/400-extractor.py            |  203 ++
 tests/functional-tests/500-writeback.py            |  251 ++
 tests/functional-tests/Makefile.am                 |   80 +-
 tests/functional-tests/backup-restore-tc.py        |  558 ----
 tests/functional-tests/bootup-tc.py                |  155 -
 tests/functional-tests/common/Makefile.am          |    7 +
 .../common/data/Doc/performance.doc                |  Bin 0 -> 82944 bytes
 .../{ => common}/data/Images/Makefile.am           |    0
 .../{ => common}/data/Images/test-image-1.jpg      |  Bin 7558 -> 7558 bytes
 .../{ => common}/data/Images/test-image-2.png      |  Bin 2374 -> 2374 bytes
 .../{ => common}/data/Images/test-image-3.tif      |  Bin 4594 -> 4594 bytes
 .../functional-tests/{ => common}/data/Makefile.am |    0
 .../{ => common}/data/Music/Makefile.am            |    0
 .../{ => common}/data/Music/tracker-mp3-test.mp3   |  Bin 61547 -> 61547 bytes
 .../common/data/Pdf/office-tools-test-document.pdf |  Bin 0 -> 236639 bytes
 tests/functional-tests/common/data/Ppt/al-cont.ppt |  Bin 0 -> 1508864 bytes
 .../{ => common}/data/Video/Makefile.am            |    0
 .../{ => common}/data/Video/test-video.mp4         |  Bin 211931 -> 211931 bytes
 .../{ => common}/data/pickled_Images               |  Bin 1203 -> 1203 bytes
 .../{ => common}/data/pickled_Music                |  Bin 877 -> 877 bytes
 tests/functional-tests/common/utils/.gitignore     |    1 +
 tests/functional-tests/common/utils/Makefile.am    |   16 +
 .../common/utils/configuration.py.in               |   75 +
 .../common/utils/expectedFailure.py                |   48 +
 tests/functional-tests/common/utils/helpers.py     |  281 ++
 tests/functional-tests/common/utils/html.py        |   64 +
 tests/functional-tests/common/utils/minertest.py   |   99 +
 tests/functional-tests/common/utils/storetest.py   |   47 +
 tests/functional-tests/common/utils/system.py      |  329 ++
 tests/functional-tests/configuration.py            |  179 -
 tests/functional-tests/create-tests-xml.py         |  100 +
 tests/functional-tests/data/Text/Makefile.am       |    8 -
 .../force-sqlite-misused-batch.sh.in               |    9 -
 tests/functional-tests/force-sqlite-misused.sh.in  |    9 -
 tests/functional-tests/helper-test-data.sh.in      |   44 -
 tests/functional-tests/metadata_extraction_tc.py   | 1162 -------
 tests/functional-tests/miner-basic-ops.py          |  798 -----
 tests/functional-tests/performance-tc-modified.py  | 3506 ++++++++++++++++++++
 .../test-configurations/Makefile.am                |    3 +
 .../miner-basic-ops/Makefile.am                    |    9 +
 .../miner-basic-ops/tracker/tracker-fts.cfg        |   16 +
 .../miner-basic-ops/tracker/tracker-miner-fs.cfg   |   57 +
 .../miner-basic-ops/tracker/tracker-store.cfg      |    4 +
 .../test-configurations/writeback/Makefile.am      |    8 +
 .../writeback/tracker/tracker-miner-fs.cfg         |   57 +
 .../test-extraction-data/Makefile.am               |    3 +
 tests/functional-tests/test-extraction-data/README |   56 +
 .../test-extraction-data/audio/Makefile.am         |   11 +
 .../audio/audio-test-1.expected                    |   19 +
 .../audio/audio-test-1.mp3}                        |  Bin 61547 -> 61547 bytes
 .../audio/audio-test-2.expected                    |   19 +
 .../test-extraction-data/audio/audio-test-2.mp3    |  Bin 0 -> 65536 bytes
 .../test-extraction-data/images/Makefile.am        |   13 +
 .../images/corrupted-image.expected                |    8 +
 .../images/corrupted-image.gif                     |  Bin 0 -> 224 bytes
 .../images/test-image-1.expected                   |   21 +
 .../images}/test-image-1.jpg                       |  Bin 7558 -> 7558 bytes
 .../images/test-image-2.expected                   |   11 +
 .../images}/test-image-2.png                       |  Bin 2374 -> 2374 bytes
 .../images/test-image-3.expected                   |   13 +
 .../images}/test-image-3.tif                       |  Bin 4594 -> 4594 bytes
 .../test-extraction-data/office/Makefile.am        |   13 +
 .../test-extraction-data/office/office-doc.doc     |  Bin 0 -> 82944 bytes
 .../office/office-doc.expected                     |   10 +
 .../test-extraction-data/office/pdf-doc.expected   |    9 +
 .../test-extraction-data/office/pdf-doc.pdf        |  Bin 0 -> 236639 bytes
 .../office/powerpoint.expected                     |    9 +
 .../test-extraction-data/office/powerpoint.ppt     |  Bin 0 -> 1508864 bytes
 .../test-extraction-data/video/184505.expected     |   12 +
 .../test-extraction-data/video/184505.mp4          |  Bin 0 -> 74438 bytes
 .../test-extraction-data/video/Makefile.am         |   13 +
 .../test-extraction-data/video/video-1.expected    |   11 +
 .../video/video-1.mp4}                             |  Bin 211931 -> 211931 bytes
 .../test-extraction-data/video/video-2.expected    |   11 +
 .../test-extraction-data/video/video-2.mov         |  Bin 0 -> 170678 bytes
 .../test-writeback-data/Makefile.am                |   10 +
 .../test-writeback-data/writeback-test-1.jpeg      |  Bin 0 -> 306 bytes
 .../writeback-test-2.tif}                          |  Bin 4594 -> 4594 bytes
 .../writeback-test-4.png}                          |  Bin 2374 -> 2374 bytes
 tests/functional-tests/tests.xml                   |  822 -----
 tests/functional-tests/ttl/.gitignore              |    1 +
 tests/functional-tests/ttl/Makefile.am             |   56 +
 tests/functional-tests/unittest2/Makefile.am       |   21 +
 tests/functional-tests/unittest2/__init__.py       |   70 +
 tests/functional-tests/unittest2/__main__.py       |   12 +
 tests/functional-tests/unittest2/case.py           | 1057 ++++++
 tests/functional-tests/unittest2/compatibility.py  |   66 +
 tests/functional-tests/unittest2/loader.py         |  316 ++
 tests/functional-tests/unittest2/main.py           |  234 ++
 tests/functional-tests/unittest2/result.py         |  183 +
 tests/functional-tests/unittest2/runner.py         |  206 ++
 tests/functional-tests/unittest2/signals.py        |   57 +
 tests/functional-tests/unittest2/suite.py          |  262 ++
 tests/functional-tests/unittest2/unit2             |    8 +
 tests/functional-tests/unittest2/unit2.py          |    8 +
 tests/functional-tests/unittest2/util.py           |   92 +
 tests/functional-tests/writeback-tc.py             | 1053 ------
 utils/data-generators/barnum/gen_data.py           |    1 -
 utils/data-generators/cc/convert_data.py           |    2 +-
 utils/data-generators/cc/gen_data.py               |    1 -
 utils/data-generators/cc/generate                  |   22 +-
 121 files changed, 10194 insertions(+), 5873 deletions(-)
---