Merge lp:~gary-lasker/software-center/recommender-test-fix into lp:software-center

[Gary Lasker]

* lp:~gary-lasker/software-center/recommender-test-fix:
    - update the recommender feedback unit test to work on systems
      that are not opted-in

This branch fixes the test_implicit_recommender_feedback unit test so that it will work on systems that are not actually opted-in to the recommendations service. I've removed the corresponding unittest.skipIf for this test. Note that this fix also takes care of the "ValidationException: Argument 'uuid' must match pattern '[\dabcdef]{32}$'" exceptions that are thrown for some of the other tests.

Thank you for your review!

[Michael Vogt (mvo)]

Thanks, looks good.

The test failed for me when running it initially with the following error:
======================================================================
FAIL: test_recommended_for_you_spinner_display (__main__.RecommendationsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gtk3/test_catview.py", line 162, in test_recommended_for_you_spinner_display
    self.rec_panel.recommended_for_you_content.get_property("visible"))
AssertionError: False is not true

----------------------------------------------------------------------
Ran 9 tests in 19.177s

but subsequent runs worked, it seems to be random, maybe 1 out 5. And I doubt its releated
to this branch so I will merge it. But it would be nice if that could be investigated.

review: Approve

[Gary Lasker (gary-lasker)]

I have seen this test failure myself for a while now, for me it happens about one out of 10 runs, and I just haven't had the chance to investigate it. Indeed, it is completely unrelated to anything in this branch. It seems like just a race issue in the test as I personally have not seen problems in this area in the real code.

=== modified file 'tests/gtk3/test_catview.py'
--- tests/gtk3/test_catview.py	2012-09-07 08:16:25 +0000
+++ tests/gtk3/test_catview.py	2012-09-11 01:14:20 +0000
@@ -167,7 +167,7 @@
                 mock_network_state_is_connected):
         # simulate no network available
         mock_network_state_is_connected.return_value = False
-        self._populate_recommended_for_you_panel()
+        self._opt_in_and_populate_recommended_for_you_panel()
         self.assertEqual(self.rec_panel.spinner_notebook.get_current_page(),
                          FramedHeaderBox.CONTENT)
         # ensure that we are showing the network not available view
@@ -177,7 +177,7 @@
                          self.rec_panel.NO_NETWORK_RECOMMENDATIONS_TEXT)
 
     def test_recommended_for_you_display_recommendations(self):
-        self._populate_recommended_for_you_panel()
+        self._opt_in_and_populate_recommended_for_you_panel()
         # we fake the callback from the agent here
         for_you = self.rec_panel.recommended_for_you_cat
         for_you._recommend_me_result(None,
@@ -204,7 +204,7 @@
         self.assertFalse(visible)
 
     def test_recommended_for_you_display_recommendations_opted_in(self):
-        self._populate_recommended_for_you_panel()
+        self._opt_in_and_populate_recommended_for_you_panel()
 
         # we want to work in the "subcat" view
         self.notebook.next_page()
@@ -240,10 +240,8 @@
         self.assertNotEqual(self._cat, None)
         self.assertEqual(self._cat.name, "Recommended For You in Internet")
         
-    @unittest.skipIf(not get_config().recommender_uuid,
-                     "this will only work when signed in")
     def test_implicit_recommender_feedback(self):
-        self._populate_recommended_for_you_panel()
+        self._opt_in_and_populate_recommended_for_you_panel()
         # we fake the callback from the agent here
         for_you = self.rec_panel.recommended_for_you_cat
         for_you._recommend_me_result(None,
@@ -278,7 +276,7 @@
         # this test insures that we only provide feedback when installing
         # items clicked to via the recommendations panel itself, and not
         # via the What's New or Top Rated panels
-        self._populate_recommended_for_you_panel()
+        self._opt_in_and_populate_recommended_for_you_panel()
         # we fake the callback from the agent here
         for_you = self.rec_panel.recommended_for_you_cat
         for_you._recommend_me_result(None,
@@ -317,10 +315,13 @@
             # fired the implicit feedback call to the recommender
             self.assertFalse(mock_post_implicit_feedback.called)
 
-    def _populate_recommended_for_you_panel(self):
+    def _opt_in_and_populate_recommended_for_you_panel(self):
         # click the opt-in button to initiate the process
         self.rec_panel.opt_in_button.clicked()
         do_events()
+        # simulate a successful opt-in by setting the recommender_uuid
+        self.rec_panel.recommender_agent._set_recommender_uuid(
+                "35fd653e67b14482b7a8b632ea90d1b6")
         # and update the recommended for you panel to load it up
         self.rec_panel._update_recommended_for_you_content()
         do_events()