[tracker-miners/sam/test-runner-fix: 19/21] functional-tests: Clean unused code from TrackerSystemAbstraction

[Sam Thursfield <sthursfield src gnome org>]

commit 1ddee4b263bb6e211e1d154516ff8f8ecefae4c2
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Jan 5 15:49:45 2019 +0100

    functional-tests: Clean unused code from TrackerSystemAbstraction

 tests/functional-tests/common/utils/storetest.py |  4 +--
 tests/functional-tests/common/utils/system.py    | 31 ------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)
---
diff --git a/tests/functional-tests/common/utils/storetest.py 
b/tests/functional-tests/common/utils/storetest.py
index be16b6caa..aeccf041c 100644
--- a/tests/functional-tests/common/utils/storetest.py
+++ b/tests/functional-tests/common/utils/storetest.py
@@ -34,12 +34,10 @@ class CommonTrackerStoreTest (ut.TestCase):
         """
         @classmethod 
        def setUpClass (self):
-            #print "Starting the daemon in test mode"
             self.system = TrackerSystemAbstraction ()
             self.system.tracker_store_testing_start ()
             self.tracker = self.system.store
 
         @classmethod
         def tearDownClass (self):
-            #print "Stopping the daemon in test mode (Doing nothing now)"
-            self.system.tracker_store_testing_stop ()
+            self.system.finish ()
diff --git a/tests/functional-tests/common/utils/system.py b/tests/functional-tests/common/utils/system.py
index 1fbf8b967..e79666995 100644
--- a/tests/functional-tests/common/utils/system.py
+++ b/tests/functional-tests/common/utils/system.py
@@ -92,12 +92,6 @@ class TrackerSystemAbstraction (object):
     def tracker_store_start (self):
         self.store.start ()
 
-    def tracker_store_stop_nicely (self):
-        self.store.stop ()
-
-    def tracker_store_stop_brutally (self):
-        self.store.kill ()
-
     def tracker_store_restart_with_new_ontologies (self, ontodir):
         self.store.stop ()
         if ontodir:
@@ -135,14 +129,6 @@ class TrackerSystemAbstraction (object):
         shutil.rmtree (db_location)
         os.mkdir (db_location)
 
-    def tracker_store_testing_stop (self):
-        """
-        Stops a running tracker-store
-        """
-        assert self.store
-        self.store.stop ()
-
-
     def tracker_miner_fs_testing_start (self, confdir=None):
         """
         Stops any previous instance of the store and miner, calls set_up_environment,
@@ -160,33 +146,16 @@ class TrackerSystemAbstraction (object):
         self.miner_fs = helpers.MinerFsHelper ()
         self.miner_fs.start ()
 
-    def tracker_miner_fs_testing_stop (self):
-        """
-        Stops the extractor, miner-fs and store running
-        """
-        self.extractor.stop ()
-        self.miner_fs.stop ()
-        self.store.stop ()
-
     def tracker_writeback_testing_start (self, confdir=None):
         # Start the miner-fs (and store) and then the writeback process
         self.tracker_miner_fs_testing_start (confdir)
         self.writeback = helpers.WritebackHelper ()
         self.writeback.start ()
 
-    def tracker_writeback_testing_stop (self):
-        # Tracker write must have been started before
-        self.writeback.stop ()
-        self.tracker_miner_fs_testing_stop ()
-
     def tracker_all_testing_start (self, confdir=None):
         # This will start all miner-fs, store and writeback
         self.tracker_writeback_testing_start (confdir)
 
-    def tracker_all_testing_stop (self):
-        # This will stop all miner-fs, store and writeback
-        self.tracker_writeback_testing_stop ()
-
     def finish (self):
         """
         Stop all running processes and remove all test data.