Merge lp:~mvo/software-center/apptreeview-tweaks into lp:software-center

[Michael Vogt]

This branch gets rid of the
"""
 AttributeError: 'TreeModelFilter' object has no attribute 'load_range' bug
"""
errors when navigating to the installed pane. But in order to fix that I had to look around for quite a bit
and did some refactor/cleanup along the way and added profile data and some more fixes:
- move the logic for appname into the db as far as possible
- merge _AppPropertiesHelper and AppPropertiesHelper
- fix a missing self.hide_appview_spinner() that prevented the installed pane to show up quicker
- add some profile data
- make the testcode in appview.py show a List and the testcode in apptreeview.py show a test treeview
- merge test_app_view.py and test_appview.py

[lp:~mvo/software-center/apptreeview-tweaks]

2796. By Michael Vogt on 2012-03-08

pyflake fixes

[Gary Lasker (gary-lasker)]

These are very nice changes indeed. Thank you, Michael!!

review: Approve

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2012-02-16 09:52:24 +0000
+++ softwarecenter/db/application.py	2012-03-08 15:25:23 +0000
@@ -103,6 +103,8 @@
         if doc:
             appname = db.get_appname(doc)
             if appname:
+                if db.is_appname_duplicated(appname):
+                    appname = "%s (%s)" % (appname, db.get_pkgname(doc))
                 return appname
             else:
                 return db.get_summary(doc)
 
=== modified file 'softwarecenter/testutils.py'
--- softwarecenter/testutils.py	2012-03-01 10:13:53 +0000
+++ softwarecenter/testutils.py	2012-03-08 15:25:23 +0000
@@ -102,6 +102,13 @@
     import softwarecenter.paths
     return softwarecenter.paths.datadir
 
+def get_test_categories(db):
+    import softwarecenter.paths
+    from softwarecenter.db.categories import CategoriesParser
+    parser = CategoriesParser(db)
+    cats = parser.parse_applications_menu(softwarecenter.paths.APP_INSTALL_PATH)
+    return cats
+
 def get_test_enquirer_matches(db, query=None, limit=20, sortmode=0):
     from softwarecenter.db.enquire import AppEnquire
     import xapian
 
=== modified file 'softwarecenter/ui/gtk3/models/appstore2.py'
--- softwarecenter/ui/gtk3/models/appstore2.py	2012-01-05 11:24:20 +0000
+++ softwarecenter/ui/gtk3/models/appstore2.py	2012-03-08 15:25:23 +0000
@@ -31,7 +31,6 @@
 from softwarecenter.utils import ExecutionTime, SimpleFileDownloader, split_icon_ext
 from softwarecenter.backend import get_install_backend
 from softwarecenter.backend.reviews import get_review_loader
-from softwarecenter.db.database import Application
 from softwarecenter.paths import SOFTWARE_CENTER_ICON_CACHE_DIR
 
 import softwarecenter.paths
@@ -74,7 +73,7 @@
         return
 
 
-class _AppPropertiesHelper(GObject.GObject):
+class AppPropertiesHelper(GObject.GObject):
     """ Baseclass that contains common functions for our
         liststore/treestore, only useful for subclassing
     """
@@ -86,8 +85,30 @@
                            ),
         }
 
-    def __init__(self):
+    def __init__(self, db, cache, icons, icon_size=48, global_icon_cache=False):
         GObject.GObject.__init__(self)
+        self.db = db
+        self.cache = cache
+
+        # get all categories
+        cat_parser = CategoriesParser(db)
+        self.all_categories = cat_parser.parse_applications_menu(
+            softwarecenter.paths.APP_INSTALL_PATH)
+
+        # reviews stats loader
+        self.review_loader = get_review_loader(cache, db)
+
+        # icon jazz
+        self.icons = icons
+        self.icon_size = icon_size
+
+        # cache the 'missing icon' used in the treeview for apps without an icon
+        self._missing_icon = icons.load_icon(Icons.MISSING_APP, icon_size, 0)
+        if global_icon_cache:
+            self.icon_cache = _app_icon_cache
+        else:
+            self.icon_cache = {}
+        return
 
     def _download_icon_and_show_when_ready(self, url, pkgname, icon_file_name):
         LOG.debug("did not find the icon locally, must download %s" % icon_file_name)
@@ -138,31 +159,23 @@
         return self.db.get_pkgname(doc)
 
     def get_application(self, doc):
-        appname = doc.get_value(XapianValues.APPNAME)
-        pkgname = self.db.get_pkgname(doc)
-        # TODO: requests
-        return Application(appname, pkgname, "")
+        return self.db.get_application(doc)
 
     def get_appname(self, doc):
-        appname = doc.get_value(XapianValues.APPNAME)
-        if not appname:
-            appname = self.db.get_summary(doc)
-        else:
-            if self.db.is_appname_duplicated(appname):
-                appname = "%s (%s)" % (appname, self.get_pkgname(doc))
-        return appname
+        app = self.db.get_application(doc)
+        return app.get_display_name(self.db, doc)
 
     def get_markup(self, doc):
-        appname = doc.get_value(XapianValues.APPNAME)
+        app = self.db.get_application(doc)
 
-        if not appname:
+        # the logic is that "apps" are displayed normally
+        # but "packages" are displayed with their summary as name
+        if app.appname:
+            appname = self.get_appname(doc)
+            summary = self.db.get_summary(doc)
+        else:
             appname = self.db.get_summary(doc)
             summary = self.get_pkgname(doc)
-        else:
-            if self.db.is_appname_duplicated(appname):
-                appname = "%s (%s)" % (appname, self.get_pkgname(doc))
-
-            summary = self.db.get_summary(doc)
 
         return "%s\n<small>%s</small>" % (
                  GObject.markup_escape_text(appname),
@@ -239,44 +252,14 @@
         else:
             return ''
 
-class AppPropertiesHelper(_AppPropertiesHelper):
-
-    def __init__(self, db, cache, icons, icon_size=48, global_icon_cache=False):
-        super(AppPropertiesHelper, self).__init__()
-        self.db = db
-        self.cache = cache
-
-        cat_parser = CategoriesParser(db)
-        self.all_categories = cat_parser.parse_applications_menu(
-            softwarecenter.paths.APP_INSTALL_PATH)
-
-        # reviews stats loader
-        self.review_loader = get_review_loader(cache, db)
-
-        # icon jazz
-        self.icons = icons
-        self.icon_size = icon_size
-        # cache the 'missing icon' used in the treeview for apps without an icon
-        self._missing_icon = icons.load_icon(Icons.MISSING_APP,
-                                             icon_size, 0)
-
-        if global_icon_cache:
-            self.icon_cache = _app_icon_cache
-        else:
-            self.icon_cache = {}
-        return
-
     def get_icon_at_size(self, doc, width, height):
         pixbuf = self.get_icon(doc)
         pixbuf = pixbuf.scale_simple(width, height,
                                      GdkPixbuf.InterpType.BILINEAR)
         return pixbuf
 
-    def get_transaction_progress(self, doc):
-        raise NotImplemented
-
-
-class AppGenericStore(_AppPropertiesHelper):
+
+class AppGenericStore(AppPropertiesHelper):
 
     # column types
     COL_TYPES = (GObject.TYPE_PYOBJECT,)
@@ -291,12 +274,8 @@
     LOAD_INITIAL   = 75
 
     def __init__(self, db, cache, icons, icon_size, global_icon_cache):
-        # the usual suspects
-        self.db = db
-        self.cache = cache
-
-        # reviews stats loader
-        self.review_loader = get_review_loader(cache, db)
+        AppPropertiesHelper.__init__(self, db, cache, icons, icon_size, 
+                                     global_icon_cache)
 
         # backend stuff
         self.backend = get_install_backend()
@@ -307,21 +286,9 @@
         # keep track of paths for transactions in progress
         self.transaction_path_map = {}
 
-        # icon jazz
-        self.icons = icons
-        self.icon_size = icon_size
-
-        if global_icon_cache:
-            self.icon_cache = _app_icon_cache
-        else:
-            self.icon_cache = {}
-
         # active row path
         self.active_row = None
 
-        # cache the 'missing icon' used in the treeview for apps without an icon
-        self._missing_icon = icons.load_icon(Icons.MISSING_APP, icon_size, 0)
-
         self._in_progress = False
         self._break = False
 
@@ -396,6 +363,10 @@
             GObject.idle_add(buffer_icons)
         return
 
+    def load_range(self, indices, step):
+        # stub
+        return
+
 class AppListStore(Gtk.ListStore, AppGenericStore):
     """ use for flat applist views. for large lists this appends rows approx
         three times faster than the AppTreeStore equivalent
@@ -526,3 +497,4 @@
         self.transaction_path_map = {}
         Gtk.TreeStore.clear(self)
         return
+
 
=== modified file 'softwarecenter/ui/gtk3/panes/installedpane.py'
--- softwarecenter/ui/gtk3/panes/installedpane.py	2012-03-06 18:19:33 +0000
+++ softwarecenter/ui/gtk3/panes/installedpane.py	2012-03-08 15:25:23 +0000
@@ -30,7 +30,8 @@
 
 from softwarecenter.enums import (NonAppVisibility,
                                   SortMethods)
-from softwarecenter.utils import wait_for_apt_cache_ready, utf8
+from softwarecenter.utils import (
+    wait_for_apt_cache_ready, utf8, ExecutionTime)
 from softwarecenter.db.categories import (CategoriesParser,
                                           categories_sorted_by_name)
 from softwarecenter.ui.gtk3.models.appstore2 import (
@@ -209,6 +210,8 @@
         # hacky, hide the header
         self.app_view.header_hbox.hide()
 
+        self.hide_appview_spinner()
+
         # now we are initialized
         self.emit("installed-pane-created")
         
@@ -313,6 +316,10 @@
         model = self.base_model # base model not treefilter
         model.clear()
 
+        def profiled_rebuild_categorised_view():
+            with ExecutionTime("rebuild_categorized_view"):
+                rebuild_categorised_view()
+
         def rebuild_categorised_view():
             self.cat_docid_map = {}
             enq = self.enquirer
@@ -324,6 +331,7 @@
 
             xfilter = AppFilter(self.db, self.cache)
             xfilter.set_installed_only(True)
+            
             for cat in self._all_cats:
                 # for each category do category query and append as a new
                 # node to tree_view
@@ -379,9 +387,6 @@
             # hide the local spinner
             self.hide_installed_view_spinner()
             
-            # hide the main spinner (if it's showing)
-            self.hide_appview_spinner()
-            
             if window:
                 window.set_cursor(None)
             
@@ -392,7 +397,7 @@
             self.emit("app-list-changed", i)
             return
 
-        GObject.idle_add(rebuild_categorised_view)
+        GObject.idle_add(profiled_rebuild_categorised_view)
         return
         
     def _build_oneconfview(self):
@@ -407,6 +412,10 @@
         model = self.base_model # base model not treefilter
         model.clear()
 
+        def profiled_rebuild_oneconfview():
+            with ExecutionTime("rebuild_oneconfview"):
+                rebuild_oneconfview()
+
         def rebuild_oneconfview():
         
             # FIXME for P: hide the search entry
@@ -487,7 +496,7 @@
             self.emit("app-list-changed", i)
             return
 
-        GObject.idle_add(rebuild_oneconfview)
+        GObject.idle_add(profiled_rebuild_oneconfview)
         return
 
     def _check_expand(self):
 
=== modified file 'softwarecenter/ui/gtk3/views/appview.py'
--- softwarecenter/ui/gtk3/views/appview.py	2012-03-07 06:02:07 +0000
+++ softwarecenter/ui/gtk3/views/appview.py	2012-03-08 15:25:23 +0000
@@ -16,20 +16,18 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#~ from __future__ import with_statement
 
 import logging
 
 from gi.repository import Gtk, GObject
 from gettext import gettext as _
-#~ import gettext
 
 from softwarecenter.enums import SortMethods
 from softwarecenter.ui.gtk3.em import StockEms
 from softwarecenter.ui.gtk3.models.appstore2 import AppTreeStore
 from softwarecenter.ui.gtk3.widgets.apptreeview import AppTreeView
 from softwarecenter.ui.gtk3.models.appstore2 import AppPropertiesHelper
-#~ from softwarecenter.ui.gtk3.widgets.containers import FlowableGrid
+from softwarecenter.utils import ExecutionTime
 
 LOG=logging.getLogger(__name__)
 
@@ -191,10 +189,10 @@
         # ... also we dont currently support user sorting in the
         # installedview, so issue is somewhat moot for the time being...
         if isinstance(self.tree_view.appmodel, AppTreeStore):
+            LOG.debug("display_matches called on AppTreeStore, ignoring")
             return
 
         sort_by_relevance = is_search and not self.user_defined_sort_method
-
         if sort_by_relevance:
             self._use_combobox_with_sort_by_search_ranking()
             self.set_sort_method_with_no_signal(self._SORT_BY_SEARCH_RANKING)
@@ -257,30 +255,91 @@
                 py+self.tree_view.selected_row_renderer.icon_y_offset)
 
 
+
+
+
+# ----------------------------------------------- testcode
+from softwarecenter.enums import NonAppVisibility
+
+def get_query_from_search_entry(search_term):
+    import xapian
+    if not search_term:
+        return xapian.Query("")
+    parser = xapian.QueryParser()
+    user_query = parser.parse_query(search_term)
+    return user_query
+
+def on_entry_changed(widget, data):
+
+    def _work():
+        new_text = widget.get_text()
+        (view, enquirer) = data
+
+        with ExecutionTime("total time"):
+            with ExecutionTime("enquire.set_query()"):
+                enquirer.set_query(get_query_from_search_entry(new_text),
+                                  limit=100*1000,
+                                  nonapps_visible=NonAppVisibility.ALWAYS_VISIBLE)
+
+            store = view.tree_view.get_model()
+            with ExecutionTime("store.clear()"):
+                store.clear()
+
+            with ExecutionTime("store.set_from_matches()"):
+                store.set_from_matches(enquirer.matches)
+
+            with ExecutionTime("model settle (size=%s)" % len(store)):
+                while Gtk.events_pending():
+                    Gtk.main_iteration()
+        return
+
+    if widget.stamp: 
+        GObject.source_remove(widget.stamp)
+    widget.stamp = GObject.timeout_add(250, _work)
+
 def get_test_window():
+    import softwarecenter.log
+    softwarecenter.log.root.setLevel(level=logging.DEBUG)
+    softwarecenter.log.add_filters_from_string("performance")
+    fmt = logging.Formatter("%(name)s - %(message)s", None)
+    softwarecenter.log.handler.setFormatter(fmt)
+
     from softwarecenter.testutils import (
-        get_test_db, get_test_pkg_info, get_test_gtk3_icon_cache,
-        get_test_enquirer_matches)
+        get_test_db, get_test_pkg_info, get_test_gtk3_icon_cache)
     from softwarecenter.ui.gtk3.models.appstore2 import AppListStore
 
     db = get_test_db()
     cache = get_test_pkg_info()
     icons = get_test_gtk3_icon_cache()
 
-    # create the view
-    appview = AppView(db, cache, icons, show_ratings=True)
-    liststore = AppListStore(db, cache, icons)
-    appview.set_model(liststore)
-
-    # do a simple query and display that
-    appview.display_matches(get_test_enquirer_matches(db))
-
-    # and put it in the window
+    # create a filter
+    from softwarecenter.db.appfilter import AppFilter
+    filter = AppFilter(db, cache)
+    filter.set_supported_only(False)
+    filter.set_installed_only(True)
+
+    # appview
+    from softwarecenter.db.enquire import AppEnquire
+    enquirer = AppEnquire(cache, db)
+    store = AppListStore(db, cache, icons)
+
+    from softwarecenter.ui.gtk3.views.appview import AppView
+    view = AppView(db, cache, icons, show_ratings=True)
+    view.set_model(store)
+
+    entry = Gtk.Entry()
+    entry.stamp = 0
+    entry.connect("changed", on_entry_changed, (view, enquirer))
+
+    box = Gtk.VBox()
+    box.pack_start(entry, False, True, 0)
+    box.pack_start(view, True, True, 0)
+
     win = Gtk.Window()
-    win.add(appview)
-    win.set_data("appview", appview)
-
+    win.set_data("appview", view)
+    win.set_data("entry", entry)
     win.connect("destroy", lambda x: Gtk.main_quit())
+    win.add(box)
     win.set_size_request(600, 400)
     win.show_all()
 
@@ -288,4 +347,5 @@
 
 if __name__ == "__main__":
     win = get_test_window()
+    win.get_data("entry").set_text("gtk3")
     Gtk.main()
 
=== modified file 'softwarecenter/ui/gtk3/widgets/apptreeview.py'
--- softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-03-07 06:02:07 +0000
+++ softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-03-08 15:25:23 +0000
@@ -1,7 +1,5 @@
 from gi.repository import Gtk, Gdk, GObject
 import logging
-import os
-import xapian
 
 from gettext import gettext as _
 
@@ -13,7 +11,7 @@
                            CellButtonIDs)
 
 from softwarecenter.ui.gtk3.em import em, StockEms
-from softwarecenter.enums import (AppActions, NonAppVisibility, Icons)
+from softwarecenter.enums import (AppActions, Icons)
 from softwarecenter.utils import ExecutionTime
 from softwarecenter.backend import get_install_backend
 from softwarecenter.netstatus import (get_network_watcher,
@@ -168,7 +166,8 @@
         return None
 
     def get_rowref(self, model, path):
-        if path == None: return None
+        if path == None:
+            return None
         return model[path][AppGenericStore.COL_ROW_DATA]
 
     def rowref_is_category(self, rowref):
@@ -469,6 +468,12 @@
 
         path = model.get_path(it)
 
+        # this will give us the right underlying model regardless if its
+        # a TreeModelFilter, a AppTreeStore or a AppListStore
+        model = self.appmodel
+
+        # this will pre-load data *only* on a AppListStore, it has
+        # no effect with a AppTreeStore
         if model[path][0] is None:
             indices = path.get_indices()
             model.load_range(indices, 5)
@@ -586,41 +591,6 @@
         return self.get_path_at_pos(x, y)[0] == self.get_cursor()[0]
 
 
-def get_query_from_search_entry(search_term):
-    if not search_term:
-        return xapian.Query("")
-    parser = xapian.QueryParser()
-    user_query = parser.parse_query(search_term)
-    return user_query
-
-def on_entry_changed(widget, data):
-
-    def _work():
-        new_text = widget.get_text()
-        (view, enquirer) = data
-
-        with ExecutionTime("total time"):
-            with ExecutionTime("enquire.set_query()"):
-                enquirer.set_query(get_query_from_search_entry(new_text),
-                                  limit=100*1000,
-                                  nonapps_visible=NonAppVisibility.ALWAYS_VISIBLE)
-
-            store = view.tree_view.get_model()
-            with ExecutionTime("store.clear()"):
-                store.clear()
-
-            with ExecutionTime("store.set_documents()"):
-                store.set_from_matches(enquirer.matches)
-
-            with ExecutionTime("model settle (size=%s)" % len(store)):
-                while Gtk.events_pending():
-                    Gtk.main_iteration()
-        return
-
-    if widget.stamp: GObject.source_remove(widget.stamp)
-    widget.stamp = GObject.timeout_add(250, _work)
-
-
 
 def get_test_window():
     import softwarecenter.log
@@ -629,24 +599,13 @@
     fmt = logging.Formatter("%(name)s - %(message)s", None)
     softwarecenter.log.handler.setFormatter(fmt)
 
-    from softwarecenter.paths import XAPIAN_BASE_PATH
-    xapian_base_path = XAPIAN_BASE_PATH
-    pathname = os.path.join(xapian_base_path, "xapian")
-
-    # the store
-    from softwarecenter.db.pkginfo import get_pkg_info
-    cache = get_pkg_info()
-    cache.open()
-
-    # the db
-    from softwarecenter.db.database import StoreDatabase
-    db = StoreDatabase(pathname, cache)
-    db.open()
-
-    # additional icons come from app-install-data
-    icons = Gtk.IconTheme.get_default()
-    icons.prepend_search_path("/usr/share/app-install/icons/")
-    icons.prepend_search_path("/usr/share/software-center/icons/")
+    from softwarecenter.testutils import (
+        get_test_db, get_test_pkg_info, get_test_gtk3_icon_cache,
+        get_test_categories)
+
+    cache = get_test_pkg_info()
+    db = get_test_db()
+    icons = get_test_gtk3_icon_cache()
 
     # create a filter
     from softwarecenter.db.appfilter import AppFilter
@@ -654,30 +613,29 @@
     filter.set_supported_only(False)
     filter.set_installed_only(True)
 
-    # appview
-    from softwarecenter.ui.gtk3.models.appstore2 import AppListStore
-    from softwarecenter.db.enquire import AppEnquire
-    enquirer = AppEnquire(cache, db)
-    store = AppListStore(db, cache, icons)
+    # get the TREEstore
+    from softwarecenter.ui.gtk3.models.appstore2 import AppTreeStore
+    store = AppTreeStore(db, cache, icons)
 
+    # populate from data
+    cats = get_test_categories(db)
+    for cat in cats[:3]:
+        with ExecutionTime("query cat '%s'" % cat.name):
+            docs = db.get_docs_from_query(cat.query)
+            store.set_category_documents(cat, docs)
+    
+    # ok, this is confusing - the AppView contains the AppTreeView that
+    #                         is a tree or list depending on the model
     from softwarecenter.ui.gtk3.views.appview import AppView
-    view = AppView(db, cache, icons, show_ratings=True)
-    view.set_model(store)
-
-    entry = Gtk.Entry()
-    entry.stamp = 0
-    entry.connect("changed", on_entry_changed, (view, enquirer))
-    entry.set_text("gtk3")
-
-    scroll = Gtk.ScrolledWindow()
+    app_view = AppView(db, cache, icons, show_ratings=True)
+    app_view.set_model(store)
+
     box = Gtk.VBox()
-    box.pack_start(entry, False, True, 0)
-    box.pack_start(scroll, True, True, 0)
+    box.pack_start(app_view, True, True, 0)
 
     win = Gtk.Window()
+    win.add(box)
     win.connect("destroy", lambda x: Gtk.main_quit())
-    scroll.add(view)
-    win.add(box)
     win.set_size_request(600, 400)
     win.show_all()
 
 
=== modified file 'test/gtk3/test_app_view.py'
--- test/gtk3/test_app_view.py	2012-01-16 14:42:49 +0000
+++ test/gtk3/test_app_view.py	2012-03-08 15:25:23 +0000
@@ -1,11 +1,8 @@
 #!/usr/bin/python
 
-import time
 import unittest
 import xapian
 
-from gi.repository import Gtk
-
 from testutils import setup_test_env
 setup_test_env()
 
@@ -15,6 +12,7 @@
 from softwarecenter.testutils import (get_test_db,
                                       get_test_pkg_info,
                                       get_test_gtk3_icon_cache,
+                                      do_events,
                                       )
 
 class TestAppView(unittest.TestCase):
@@ -39,7 +37,7 @@
         # set matches
         appview.clear_model()
         appview.display_matches(enquirer.matches)
-        self._p()
+        do_events()
         # verify that the order is actually the correct one
         model = appview.tree_view.get_model()
         docs_in_model = [item[0] for item in model]
@@ -49,15 +47,61 @@
         for i in range(len(docs_in_model)):
             self.assertEqual(self.db.get_pkgname(docs_in_model[i]),
                              self.db.get_pkgname(docs_from_enquirer[i]))
-
-    def _p(self):
-        for i in range(5):
-            time.sleep(0.1)
-            while Gtk.events_pending():
-                Gtk.main_iteration()
+        win.destroy()
+
+    def test_appview_search_combo(self):
+        from softwarecenter.ui.gtk3.views.appview import get_test_window
+        from softwarecenter.testutils import get_test_enquirer_matches
+
+        # test if combox sort option "by relevance" vanishes for non-searches
+        # LP: #861778
+        expected_normal = ["By Name", "By Top Rated", "By Newest First"]
+        expected_search = ["By Name", "By Top Rated", "By Newest First", 
+                           "By Relevance"]
+
+        # setup goo
+        win = get_test_window()
+        appview = win.get_data("appview")
+        #entry = win.get_data("entry")
+        do_events()
+
+        # get the model
+        model = appview.sort_methods_combobox.get_model()
+
+        # test normal window (no search)
+        matches = get_test_enquirer_matches(appview.helper.db)
+        appview.display_matches(matches, is_search=False)
+        do_events()
+        in_model = []
+        for item in model:
+            in_model.append(model.get_value(item.iter, 0))
+        self.assertEqual(in_model, expected_normal)
+
+        # now repeat and simulate a search
+        matches = get_test_enquirer_matches(appview.helper.db)
+        appview.display_matches(matches, is_search=True)
+        do_events()
+        in_model = []
+        for item in model:
+            in_model.append(model.get_value(item.iter, 0))
+        self.assertEqual(in_model, expected_search)
+
+        # and back again to no search
+        matches = get_test_enquirer_matches(appview.helper.db)
+        appview.display_matches(matches, is_search=False)
+        do_events()
+        # collect items in the model
+        in_model = []
+        for item in model:
+            in_model.append(model.get_value(item.iter, 0))
+        self.assertEqual(expected_normal, in_model)
+
+        # destroy
+        win.destroy()
+
         
 
 if __name__ == "__main__":
-    import logging
-    logging.basicConfig(level=logging.DEBUG)
+    #import logging
+    #logging.basicConfig(level=logging.DEBUG)
     unittest.main()
 
=== removed file 'test/gtk3/test_appview.py'
--- test/gtk3/test_appview.py	2012-01-16 14:42:49 +0000
+++ test/gtk3/test_appview.py	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-#!/usr/bin/python
-
-from gi.repository import Gtk, GObject
-import time
-import unittest
-
-from testutils import setup_test_env
-setup_test_env()
-
-#from mock import Mock
-
-TIMEOUT=300
-
-class TestViews(unittest.TestCase):
-
-    def test_appview_search_combo(self):
-        from softwarecenter.ui.gtk3.views.appview import get_test_window
-        from softwarecenter.testutils import get_test_enquirer_matches
-
-        # test if combox sort option "by relevance" vanishes for non-searches
-        # LP: #861778
-        expected_normal = ["By Name", "By Top Rated", "By Newest First"]
-        expected_search = ["By Name", "By Top Rated", "By Newest First", 
-                           "By Relevance"]
-
-        # setup goo
-        win = get_test_window()
-        self._p()
-        appview = win.get_data("appview")
-
-        # test normal window (no search)
-        model = appview.sort_methods_combobox.get_model()
-        # collect items in the model
-        in_model = []
-        for item in model:
-            in_model.append(model.get_value(item.iter, 0))
-        # this is what we expect there
-        self.assertEqual(expected_normal, in_model)
-
-        # now repeat and simulate a search
-        matches = get_test_enquirer_matches(appview.helper.db)
-        appview.display_matches(matches, is_search=True)
-        self._p()
-        in_model = []
-        for item in model:
-            in_model.append(model.get_value(item.iter, 0))
-        self.assertEqual(in_model, expected_search)
-
-        # and back again to no search
-        matches = get_test_enquirer_matches(appview.helper.db)
-        appview.display_matches(matches, is_search=False)
-        self._p()
-        # collect items in the model
-        in_model = []
-        for item in model:
-            in_model.append(model.get_value(item.iter, 0))
-        self.assertEqual(expected_normal, in_model)
-
-        # destroy
-        GObject.timeout_add(TIMEOUT, lambda: win.destroy())
-        Gtk.main()
-
-    def _p(self):
-        for i in range(10):
-            time.sleep(0.1)
-            while Gtk.events_pending():
-                Gtk.main_iteration()
-
-if __name__ == "__main__":
-    import logging
-    logging.basicConfig(level=logging.DEBUG)
-    unittest.main()