[tracker/sam/functional-tests-shared: 3/6] functional-tests: Move the 'helpers' module into 'trackertestutils'

[Sam Thursfield <sthursfield src gnome org>]

commit 85bad4221dc2db5f5e1eff9c47cbf0a88b0b955f
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Aug 14 16:18:07 2019 +0200

    functional-tests: Move the 'helpers' module into 'trackertestutils'

 tests/functional-tests/17-ontology-changes.py                      | 4 ++--
 tests/functional-tests/common/utils/storetest.py                   | 7 +++----
 .../common/utils => utils/trackertestutils}/helpers.py             | 0
 utils/trackertestutils/meson.build                                 | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/tests/functional-tests/17-ontology-changes.py b/tests/functional-tests/17-ontology-changes.py
index c52b99d2b..d180f2585 100755
--- a/tests/functional-tests/17-ontology-changes.py
+++ b/tests/functional-tests/17-ontology-changes.py
@@ -33,9 +33,9 @@ import tempfile
 import time
 
 import trackertestutils.dconf
+import trackertestutils.helpers
 
 from common.utils import configuration as cfg
-from common.utils import helpers
 from common.utils.expectedFailure import expectedFailureJournal
 import unittest as ut
 
@@ -117,7 +117,7 @@ class TrackerSystemAbstraction (object):
         """
         self.set_up_environment(confdir, ontodir)
 
-        self.store = helpers.StoreHelper(cfg.TRACKER_STORE_PATH)
+        self.store = trackertestutils.helpers.StoreHelper(cfg.TRACKER_STORE_PATH)
         self.store.start()
 
     def tracker_store_restart_with_new_ontologies(self, ontodir):
diff --git a/tests/functional-tests/common/utils/storetest.py 
b/tests/functional-tests/common/utils/storetest.py
index 5cec5475e..06ef3e0d0 100644
--- a/tests/functional-tests/common/utils/storetest.py
+++ b/tests/functional-tests/common/utils/storetest.py
@@ -19,12 +19,11 @@
 # 02110-1301, USA.
 #
 
-import unittest as ut
-
 import os
 import time
+import unittest as ut
 
-from common.utils.helpers import StoreHelper
+import trackertestutils.helpers
 from common.utils import configuration as cfg
 
 
@@ -39,7 +38,7 @@ class CommonTrackerStoreTest (ut.TestCase):
     def setUpClass(self):
         extra_env = {'LC_COLLATE': 'en_GB.utf8'}
 
-        self.tracker = StoreHelper(cfg.TRACKER_STORE_PATH)
+        self.tracker = trackertestutils.helpers.StoreHelper(cfg.TRACKER_STORE_PATH)
         self.tracker.start(extra_env=extra_env)
 
     @classmethod
diff --git a/tests/functional-tests/common/utils/helpers.py b/utils/trackertestutils/helpers.py
similarity index 100%
rename from tests/functional-tests/common/utils/helpers.py
rename to utils/trackertestutils/helpers.py
diff --git a/utils/trackertestutils/meson.build b/utils/trackertestutils/meson.build
index 163aecfdf..7806ee210 100644
--- a/utils/trackertestutils/meson.build
+++ b/utils/trackertestutils/meson.build
@@ -1,6 +1,7 @@
 sources = [
   '__init__.py',
   'dconf.py',
+  'helpers.py',
 ]
 
 install_data(sources,