Merge lp:~mvo/software-center/fix-server-pagination into lp:software-center

[Michael Vogt]

This small branch fixes a bug in the missing reset of the server page and adds a regression test.

[Michael Nelson (michael.nelson)]

09:29 < mvo> anyone wnats to review https://code.launchpad.net/~mvo/software-center/fix-server-pagination/+merge/88828 ? should be pretty trivial
09:29 * noodles775 looks
09:32 < noodles775> mvo: with your branch, it's intended that the _reviews_server_page is also reset if it's the same app but with force=True right?
09:35 < mvo> good point, it should be fine, but I think I will go over the code and see if we still use force at all
09:36 < mvo> and if not eliminate dead code (huuary)
09:37 < noodles775> mvo: cool.

review: Approve

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-01-06 08:35:11 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-01-17 09:28:32 +0000
@@ -1510,7 +1510,7 @@
         # init data
         self.app = app
         self.app_details = app.get_details(self.db)
-        
+
         # check if app just became available and if so, force full
         # refresh
         if (same_app and
@@ -1527,6 +1527,8 @@
         if same_app and not force:
             self._update_minimal(self.app_details)
         else:
+            # reset reviews_page
+            self._reviews_server_page = 1
             # update all (but skip the addons calculation if this is a
             # DebFileApplication as this is not useful for this case and it
             # increases the view load time dramatically)
 
=== modified file 'test/gtk3/test_appdetailsview.py'
--- test/gtk3/test_appdetailsview.py	2012-01-16 14:42:49 +0000
+++ test/gtk3/test_appdetailsview.py	2012-01-17 09:28:32 +0000
@@ -92,6 +92,20 @@
         view._add_where_is_it_launcher("/usr/share/applications/ubuntu-software-center.desktop")
         do_events()
 
+    def test_reviews_page(self):
+        win = get_test_window_appdetails()
+        view = win.get_data("view")
+        # show s-c and click on more review
+        app = Application("", "software-center")
+        view.show_app(app)
+        self.assertEqual(view._reviews_server_page, 1)
+        view._on_more_reviews_clicked(None)
+        self.assertEqual(view._reviews_server_page, 2)
+        # show different app, ensure page is reset
+        app = Application("", "apt")
+        view.show_app(app)
+        self.assertEqual(view._reviews_server_page, 1)
+
     def test_pkgstatus_bar(self):
         # make sure configure is run with the various states
         # test