[tracker: 2/2] Merge branch 'sam/ft-python2.7'

[Carlos Garnacho <carlosg src gnome org>]

commit 1b482faea969cb2c2b24625bf052c73b098a58ff
Merge: fcc79fdd6 f31e5d83e
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Jan 13 12:27:19 2019 +0100

    Merge branch 'sam/ft-python2.7'

 tests/functional-tests/01-insertion.py             |    2 +-
 tests/functional-tests/02-sparql-bugs.py           |    3 +-
 tests/functional-tests/03-fts-functions.py         |    2 +-
 tests/functional-tests/04-group-concat.py          |    2 +-
 tests/functional-tests/05-coalesce.py              |    2 +-
 tests/functional-tests/06-distance.py              |    2 +-
 tests/functional-tests/07-graph.py                 |    2 +-
 tests/functional-tests/08-unique-insertions.py     |    2 +-
 tests/functional-tests/09-concurrent-query.py      |    2 +-
 tests/functional-tests/10-sqlite-misused.py        |    2 +-
 tests/functional-tests/11-sqlite-batch-misused.py  |    2 +-
 tests/functional-tests/12-transactions.py          |    2 +-
 tests/functional-tests/13-threaded-store.py        |    2 +-
 tests/functional-tests/14-signals.py               |    2 +-
 tests/functional-tests/15-statistics.py            |    2 +-
 tests/functional-tests/16-collation.py             |    2 +-
 tests/functional-tests/17-ontology-changes.py      |    2 +-
 .../common/utils/expectedFailure.py                |   21 +-
 tests/functional-tests/common/utils/storetest.py   |    2 +-
 tests/functional-tests/unittest2/__init__.py       |   72 --
 tests/functional-tests/unittest2/__main__.py       |   14 -
 tests/functional-tests/unittest2/case.py           | 1058 --------------------
 tests/functional-tests/unittest2/compatibility.py  |   68 --
 tests/functional-tests/unittest2/loader.py         |  318 ------
 tests/functional-tests/unittest2/main.py           |  236 -----
 tests/functional-tests/unittest2/result.py         |  185 ----
 tests/functional-tests/unittest2/runner.py         |  208 ----
 tests/functional-tests/unittest2/signals.py        |   59 --
 tests/functional-tests/unittest2/suite.py          |  264 -----
 tests/functional-tests/unittest2/unit2             |    8 -
 tests/functional-tests/unittest2/unit2.py          |    8 -
 tests/functional-tests/unittest2/util.py           |   94 --
 32 files changed, 19 insertions(+), 2631 deletions(-)
---