[tracker] functional-tests: Clean up miner tests a bit

[Sam Thursfield <sthursfield src gnome org>]

commit b1804146a01c2a4ab9f74ff8be9a9e69c611b18b
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Aug 10 10:51:06 2015 +0200

    functional-tests: Clean up miner tests a bit

 .../functional-tests/301-miner-resource-removal.py |   16 ----------------
 tests/functional-tests/common/utils/minertest.py   |    8 ++++++++
 2 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/tests/functional-tests/301-miner-resource-removal.py 
b/tests/functional-tests/301-miner-resource-removal.py
index 557cadc..9c2acbc 100755
--- a/tests/functional-tests/301-miner-resource-removal.py
+++ b/tests/functional-tests/301-miner-resource-removal.py
@@ -23,17 +23,11 @@ especially in the case where nie:InformationElement != nie:DataObject
 """
 
 from common.utils import configuration as cfg
-from common.utils.dconf import DConfClient
-from common.utils.helpers import MinerFsHelper, StoreHelper, ExtractorHelper, log
 from common.utils.minertest import CommonTrackerMinerTest, path, uri
-from common.utils.system import TrackerSystemAbstraction
 
 from gi.repository import GLib
 
-import dbus
-from gi.repository import GLib
 import os
-import shutil
 import unittest2 as ut
 
 MINER_TMP_DIR = cfg.TEST_MONITORED_TMP_DIR
@@ -50,7 +44,6 @@ CONF_OPTIONS = {
     }
 }
 
-REASONABLE_TIMEOUT = 30
 
 class MinerResourceRemovalTest (CommonTrackerMinerTest):
 
@@ -80,15 +73,6 @@ class MinerResourceRemovalTest (CommonTrackerMinerTest):
         return self.tracker.await_resource_inserted (rdf_class = 'nfo:Document',
                                                      url = uri(file_name))
 
-    def assertResourceExists (self, urn):
-        if self.tracker.ask ("ASK { <%s> a rdfs:Resource }" % urn) == False:
-            self.fail ("Resource <%s> does not exist" % urn)
-
-    def assertResourceMissing (self, urn):
-        if self.tracker.ask ("ASK { <%s> a rdfs:Resource }" % urn) == True:
-            self.fail ("Resource <%s> should not exist" % urn)
-
-
     def test_01_file_deletion (self):
         """
         Ensure every logical resource (nie:InformationElement) contained with
diff --git a/tests/functional-tests/common/utils/minertest.py 
b/tests/functional-tests/common/utils/minertest.py
index c84270e..5aae50f 100644
--- a/tests/functional-tests/common/utils/minertest.py
+++ b/tests/functional-tests/common/utils/minertest.py
@@ -112,3 +112,11 @@ class CommonTrackerMinerTest (ut.TestCase):
 
     def tearDown (self):
         self.system.tracker_miner_fs_testing_stop ()
+
+    def assertResourceExists (self, urn):
+        if self.tracker.ask ("ASK { <%s> a rdfs:Resource }" % urn) == False:
+            self.fail ("Resource <%s> does not exist" % urn)
+
+    def assertResourceMissing (self, urn):
+        if self.tracker.ask ("ASK { <%s> a rdfs:Resource }" % urn) == True:
+            self.fail ("Resource <%s> should not exist" % urn)