[tracker/sam/functional-test-fixes: 16/30] functional-tests: No need to wait for miner-fs to be idle



commit 782877410f6c0ffade889279373b8cc39cf99008
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Aug 21 23:01:43 2014 +0100

    functional-tests: No need to wait for miner-fs to be idle
    
    We are running against a clean data directory, so the miner should not
    have any initial crawling work to do.

 tests/functional-tests/common/utils/helpers.py |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)
---
diff --git a/tests/functional-tests/common/utils/helpers.py b/tests/functional-tests/common/utils/helpers.py
index 1ff422a..51def7a 100644
--- a/tests/functional-tests/common/utils/helpers.py
+++ b/tests/functional-tests/common/utils/helpers.py
@@ -621,18 +621,6 @@ class MinerFsHelper (Helper):
     def start (self):
         Helper.start (self)
 
-        self.status_match = self.bus.add_signal_receiver (self._minerfs_status_cb,
-                                                          signal_name="Progress",
-                                                          path=cfg.MINERFS_OBJ_PATH,
-                                                          dbus_interface=cfg.MINER_IFACE)
-
-        # It should step out of this loop after progress changes to "Idle"
-        self.timeout_id = GLib.timeout_add_seconds (REASONABLE_TIMEOUT, self._timeout_on_idle_cb)
-        self._name_source (self.timeout_id, 'initial-idle-timeout')
-        self.loop.run ()
-        if self.timeout_id is not None:
-            GLib.source_remove (self.timeout_id)
-
         bus_object = self.bus.get_object (cfg.MINERFS_BUSNAME,
                                           cfg.MINERFS_OBJ_PATH)
         self.miner_fs = dbus.Interface (bus_object,
@@ -641,8 +629,6 @@ class MinerFsHelper (Helper):
     def stop (self):
         Helper.stop (self)
 
-        self.bus._clean_up_signal_match (self.status_match)
-
     def ignore (self, filelist):
         self.miner_fs.IgnoreNextUpdate (filelist)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]