[tracker/wip/sam/meson-functional-tests: 2/10] Allow running the functional tests without installing them

[Sam Thursfield <sthursfield src gnome org>]

commit 137697e9c726aff72b4af9ed8e917b48ffdca92b
Author: Sam Thursfield <sam thursfield codethink co uk>
Date:   Wed Nov 1 12:55:09 2017 +0000

    Allow running the functional tests without installing them
    
    This is needed so that `meson test` passes, which in turn is needed if
    we want to use `meson dist` to make releases.
    
    This involves some hackery of course, but it seems to work.

 tests/functional-tests/01-insertion.py             |    2 +-
 tests/functional-tests/02-sparql-bugs.py           |    2 +-
 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 +-
 tests/functional-tests/200-backup-restore.py       |    2 +-
 .../common/utils/applicationstest.py               |    2 +-
 tests/functional-tests/common/utils/extractor.py   |    2 +-
 tests/functional-tests/common/utils/minertest.py   |    2 +-
 tests/functional-tests/common/utils/storetest.py   |    2 +-
 .../functional-tests/common/utils/writebacktest.py |    2 +-
 .../__init__.py.in}                                |    0
 tests/functional-tests/meson.build                 |   12 ++++++++++++
 25 files changed, 35 insertions(+), 23 deletions(-)
---
diff --git a/tests/functional-tests/01-insertion.py b/tests/functional-tests/01-insertion.py
index 33fd17f..f0d49be 100755
--- a/tests/functional-tests/01-insertion.py
+++ b/tests/functional-tests/01-insertion.py
@@ -29,7 +29,7 @@ import random
 import string
 import datetime
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/02-sparql-bugs.py b/tests/functional-tests/02-sparql-bugs.py
index f4f541e..7e0ea85 100755
--- a/tests/functional-tests/02-sparql-bugs.py
+++ b/tests/functional-tests/02-sparql-bugs.py
@@ -31,7 +31,7 @@ import random
 import string
 import datetime
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/03-fts-functions.py b/tests/functional-tests/03-fts-functions.py
index fc327f7..7fdb6b9 100755
--- a/tests/functional-tests/03-fts-functions.py
+++ b/tests/functional-tests/03-fts-functions.py
@@ -25,7 +25,7 @@ and run sparql with fts functions to check the results.
 import unittest
 import random
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/04-group-concat.py b/tests/functional-tests/04-group-concat.py
index 5d9bcd1..5eb9414 100755
--- a/tests/functional-tests/04-group-concat.py
+++ b/tests/functional-tests/04-group-concat.py
@@ -23,7 +23,7 @@ Test the GROUP_CONCAT function in Sparql. Only requires the store.
 import unittest
 import random
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/05-coalesce.py b/tests/functional-tests/05-coalesce.py
index 6463cbd..60187a7 100755
--- a/tests/functional-tests/05-coalesce.py
+++ b/tests/functional-tests/05-coalesce.py
@@ -24,7 +24,7 @@ import unittest
 import random
 
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/06-distance.py b/tests/functional-tests/06-distance.py
index 04239fb..503cb73 100755
--- a/tests/functional-tests/06-distance.py
+++ b/tests/functional-tests/06-distance.py
@@ -23,7 +23,7 @@ Test the distance-calculation functions in Sparql. Only requires the Store
 import unittest
 import random
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/07-graph.py b/tests/functional-tests/07-graph.py
index 3999977..a572309 100755
--- a/tests/functional-tests/07-graph.py
+++ b/tests/functional-tests/07-graph.py
@@ -23,7 +23,7 @@ Tests graphs in Sparql. Only requires the store.
 import unittest
 import random
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/08-unique-insertions.py b/tests/functional-tests/08-unique-insertions.py
index 04909a4..ba84f56 100755
--- a/tests/functional-tests/08-unique-insertions.py
+++ b/tests/functional-tests/08-unique-insertions.py
@@ -23,7 +23,7 @@ Replicate the behaviour of the miner inserting information in the store.
 import unittest
 import random
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/09-concurrent-query.py b/tests/functional-tests/09-concurrent-query.py
index 53352bf..1520cc3 100755
--- a/tests/functional-tests/09-concurrent-query.py
+++ b/tests/functional-tests/09-concurrent-query.py
@@ -28,7 +28,7 @@ import commands
 import signal
 from gi.repository import GObject
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/10-sqlite-misused.py b/tests/functional-tests/10-sqlite-misused.py
index e9203e3..75ac7c2 100755
--- a/tests/functional-tests/10-sqlite-misused.py
+++ b/tests/functional-tests/10-sqlite-misused.py
@@ -24,7 +24,7 @@ some SQLITE_MISUSED errors before.
 import os
 from gi.repository import GObject
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/11-sqlite-batch-misused.py 
b/tests/functional-tests/11-sqlite-batch-misused.py
index c4ef0be..de79f81 100755
--- a/tests/functional-tests/11-sqlite-batch-misused.py
+++ b/tests/functional-tests/11-sqlite-batch-misused.py
@@ -24,7 +24,7 @@ some SQLITE_MISUSED errors before.
 import os
 from gi.repository import GObject
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/12-transactions.py b/tests/functional-tests/12-transactions.py
index a3c19f4..82b562c 100755
--- a/tests/functional-tests/12-transactions.py
+++ b/tests/functional-tests/12-transactions.py
@@ -22,7 +22,7 @@ Make sure that when COMMIT returns, the data is in the DB
 """
 import time
 
-from common.utils import configuration as cfg
+import configuration as cfg
 from common.utils.helpers import StoreHelper as StoreHelper
 import unittest2 as ut
 #import unittest as ut
diff --git a/tests/functional-tests/13-threaded-store.py b/tests/functional-tests/13-threaded-store.py
index 32c2c44..61d4674 100755
--- a/tests/functional-tests/13-threaded-store.py
+++ b/tests/functional-tests/13-threaded-store.py
@@ -27,7 +27,7 @@ from gi.repository import GLib
 import time
 from dbus.mainloop.glib import DBusGMainLoop
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/14-signals.py b/tests/functional-tests/14-signals.py
index 6524f7b..ec68142 100755
--- a/tests/functional-tests/14-signals.py
+++ b/tests/functional-tests/14-signals.py
@@ -25,7 +25,7 @@ are tested)
 
 import unittest2 as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
-from common.utils import configuration as cfg
+import configuration as cfg
 
 from gi.repository import Gio
 from gi.repository import GObject
diff --git a/tests/functional-tests/15-statistics.py b/tests/functional-tests/15-statistics.py
index 89efc3d..7008df3 100755
--- a/tests/functional-tests/15-statistics.py
+++ b/tests/functional-tests/15-statistics.py
@@ -24,7 +24,7 @@ are updated when different operations are executed on the store
 """
 import time
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/16-collation.py b/tests/functional-tests/16-collation.py
index 1d2dff2..e78c7cf 100755
--- a/tests/functional-tests/16-collation.py
+++ b/tests/functional-tests/16-collation.py
@@ -26,7 +26,7 @@ import time
 import random
 import locale
 
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
diff --git a/tests/functional-tests/17-ontology-changes.py b/tests/functional-tests/17-ontology-changes.py
index 8665a5d..8ef26b6 100755
--- a/tests/functional-tests/17-ontology-changes.py
+++ b/tests/functional-tests/17-ontology-changes.py
@@ -28,7 +28,7 @@ from gi.repository import GLib
 import time
 
 import os
-from common.utils import configuration as cfg
+import configuration as cfg
 import unittest2 as ut
 #import unittest as ut
 from common.utils.system import TrackerSystemAbstraction as TrackerSystemAbstraction
diff --git a/tests/functional-tests/200-backup-restore.py b/tests/functional-tests/200-backup-restore.py
index cbbb06e..6922ea6 100755
--- a/tests/functional-tests/200-backup-restore.py
+++ b/tests/functional-tests/200-backup-restore.py
@@ -23,7 +23,7 @@ import os
 
 from common.utils.system import TrackerSystemAbstraction
 from common.utils.helpers import StoreHelper
-from common.utils import configuration as cfg
+import configuration as cfg
 from common.utils.storetest import CommonTrackerStoreTest as CommonTrackerStoreTest
 from common.utils.expectedFailure import expectedFailureBug, expectedFailureJournal
 import unittest2 as ut
diff --git a/tests/functional-tests/common/utils/applicationstest.py 
b/tests/functional-tests/common/utils/applicationstest.py
index 72a8b84..91320b7 100644
--- a/tests/functional-tests/common/utils/applicationstest.py
+++ b/tests/functional-tests/common/utils/applicationstest.py
@@ -17,7 +17,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 #
-from common.utils import configuration as cfg
+import configuration as cfg
 from common.utils.system import TrackerSystemAbstraction
 from common.utils.helpers import log
 import unittest2 as ut
diff --git a/tests/functional-tests/common/utils/extractor.py 
b/tests/functional-tests/common/utils/extractor.py
index 8dd0560..e225071 100644
--- a/tests/functional-tests/common/utils/extractor.py
+++ b/tests/functional-tests/common/utils/extractor.py
@@ -18,7 +18,7 @@
 # 02110-1301, USA.
 #
 
-from common.utils import configuration as cfg
+import configuration as cfg
 from common.utils.helpers import log
 import os
 import re
diff --git a/tests/functional-tests/common/utils/minertest.py 
b/tests/functional-tests/common/utils/minertest.py
index 5aae50f..fc84e2e 100644
--- a/tests/functional-tests/common/utils/minertest.py
+++ b/tests/functional-tests/common/utils/minertest.py
@@ -17,7 +17,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 #
-from common.utils import configuration as cfg
+import configuration as cfg
 from common.utils.system import TrackerSystemAbstraction
 import unittest2 as ut
 
diff --git a/tests/functional-tests/common/utils/storetest.py 
b/tests/functional-tests/common/utils/storetest.py
index be16b6c..75e3a10 100644
--- a/tests/functional-tests/common/utils/storetest.py
+++ b/tests/functional-tests/common/utils/storetest.py
@@ -23,7 +23,7 @@ import time
 
 from common.utils.system import TrackerSystemAbstraction
 from common.utils.helpers import StoreHelper
-from common.utils import configuration as cfg
+import configuration as cfg
 
 import unittest2 as ut
 #import unittest as ut
diff --git a/tests/functional-tests/common/utils/writebacktest.py 
b/tests/functional-tests/common/utils/writebacktest.py
index 63c3ef7..65a6ef1 100644
--- a/tests/functional-tests/common/utils/writebacktest.py
+++ b/tests/functional-tests/common/utils/writebacktest.py
@@ -24,7 +24,7 @@ from common.utils.system import TrackerSystemAbstraction
 import shutil
 import unittest2 as ut
 import os
-from common.utils import configuration as cfg
+import configuration as cfg
 from common.utils.helpers import log
 import time
 
diff --git a/tests/functional-tests/common/utils/configuration.py.in 
b/tests/functional-tests/configuration/__init__.py.in
similarity index 100%
rename from tests/functional-tests/common/utils/configuration.py.in
rename to tests/functional-tests/configuration/__init__.py.in
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index 8261e14..d50feb2 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -1,3 +1,4 @@
+subdir('configuration')
 subdir('ipc')
 
 test_runner = find_program('test-runner.sh')
@@ -23,9 +24,20 @@ functional_tests = [
   '200-backup-restore',
 ]
 
+tracker_top_build_dir = join_paths(meson.current_build_dir(), '..', '..')
+
+tracker_nepomuk_ontologies = join_paths(meson.current_source_dir(), '..', '..', 'src', 'ontologies', 
'nepomuk')
+tracker_test_domain_ontology = join_paths(meson.current_source_dir(), '..', '..', 'src', 'tracker-store', 
'default.rule')
+
 foreach t: functional_tests
   test('functional-' + t, test_runner,
     args: './' + t + '.py',
+    env: [
+        'PYTHONPATH=@0@'.format(meson.current_build_dir()),
+        'TRACKER_FUNCTIONAL_TEST_BUILD_DIR=@0@'.format(tracker_top_build_dir),
+        'TRACKER_DB_ONTOLOGIES_DIR=@0@'.format(tracker_nepomuk_ontologies),
+        'TRACKER_TEST_DOMAIN_ONTOLOGY_RULE=@0@'.format(tracker_test_domain_ontology),
+    ],
     workdir: meson.current_source_dir(),
     # FIXME: these tests are all too slow
     timeout: 180)