Merge lp:~mvo/software-center/lp1043152 into lp:software-center

[Michael Vogt]

This ensures that whitespaces in packagenames are properly stripped

[Gary Lasker (gary-lasker)]

Thanks Michael!

review: Approve

=== modified file 'softwarecenter/backend/scagent.py'
--- softwarecenter/backend/scagent.py	2012-07-02 16:26:08 +0000
+++ softwarecenter/backend/scagent.py	2012-08-29 12:19:19 +0000
@@ -132,9 +132,10 @@
             # allow having urls to click on in a banner
             if not hasattr(exhibit, "click_url"):
                 exhibit.click_url = ""
-            # ensure to fix #1004417
+            # ensure to fix #1004417 and #1043152
             if exhibit.package_names:
-                exhibit.package_names = exhibit.package_names.strip()
+                exhibit.package_names = ",".join(
+                    [s.strip() for s in exhibit.package_names.split(",")])
         self.emit("exhibits", exhibits)
 
 if __name__ == "__main__":

=== modified file 'tests/test_scagent.py'
--- tests/test_scagent.py	2012-05-31 12:28:46 +0000
+++ tests/test_scagent.py	2012-08-29 12:19:19 +0000
@@ -53,24 +53,40 @@
                 'SoftwareCenterAgentAPI', 'subscriptions_for_me',
                 complete_only=True)
 
+
+class RegressionsTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.sca = SoftwareCenterAgent()
+        self.sca.emit = Mock()
+        
+    def _get_exhibit_list_from_emit_call(self):
+        args, kwargs = self.sca.emit.call_args
+        scagent, exhibit_list = args
+        return exhibit_list
+
     def test_regression_lp1004417(self):
         mock_ex = Mock()
         mock_ex.package_names = "foo,bar\n\r"
         results = [mock_ex]
-        sca = SoftwareCenterAgent()
-        sca.emit = Mock()
-        sca._on_exhibits_data_available(None, results)
-        self.assertTrue(sca.emit.called)
-        # get the args to "emit()"
-        args, kwargs = sca.emit.call_args
-        # split the args up
-        scagent, exhibit_list = args
+        self.sca._on_exhibits_data_available(None, results)
+        self.assertTrue(self.sca.emit.called)
         # and ensure we get the right list len
+        exhibit_list = self._get_exhibit_list_from_emit_call()
         self.assertEqual(len(exhibit_list), 1)
         # and the right data in the list
         exhibit = exhibit_list[0]
         self.assertEqual(exhibit.package_names, "foo,bar")
         self.assertFalse(exhibit.package_names.endswith("\n\r"))
 
+    def test_regression_lp1043152(self):
+        mock_ex = Mock()
+        mock_ex.package_names = "moo, baa, lalala"
+        results = [mock_ex]
+        self.sca._on_exhibits_data_available(None, results)
+        # ensure that the right data in the list
+        exhibit = self._get_exhibit_list_from_emit_call()[0]
+        self.assertEqual(exhibit.package_names, "moo,baa,lalala")
+
 if __name__ == "__main__":
     unittest.main()