Merge lp:~mvo/software-center/5.4-fix-save-person-to-config into lp:software-center

[Michael Vogt]

This branch ensures that the "username" is saved everytime that
the ubuntu sso whoami call is done. This helps making reviews
editable again

[Michael Vogt (mvo)]

This should also go into the 5.4 branch, a end-to-end test there is needed to ensure that editing a review still works as the rnrclient_pristine.py is using "str" for the @validate in the modify_review function there.

=== modified file 'softwarecenter/backend/ubuntusso.py'
--- softwarecenter/backend/ubuntusso.py	2012-09-14 13:25:45 +0000
+++ softwarecenter/backend/ubuntusso.py	2012-11-22 13:18:26 +0000
@@ -81,6 +81,7 @@
         # once we have data, make sure to save it
         config = get_config()
         config.email = piston_whoami["preferred_email"]
+        config.reviews_username = piston_whoami["username"]
         # emit
         self.emit("whoami", piston_whoami)
 

=== modified file 'softwarecenter/config.py'
--- softwarecenter/config.py	2012-09-06 17:25:40 +0000
+++ softwarecenter/config.py	2012-11-22 13:18:26 +0000
@@ -135,6 +135,13 @@
         None,
         "The prefered email of the user, automatically set via the ubuntu-sso")
     # the review section
+    reviews_username =  property(
+        lambda self: self._generic_get(
+            "username", section="reviews", default=""),
+        lambda self, value: self._generic_set(
+            "username", value, section="reviews"),
+        None,
+        "The sso username")
     reviews_post_via_gwibber = property(
         lambda self: self._generic_getbool(
             "gwibber_send", section="reviews", default=False),

=== modified file 'softwarecenter/utils.py'
--- softwarecenter/utils.py	2012-09-24 07:57:33 +0000
+++ softwarecenter/utils.py	2012-11-22 13:18:26 +0000
@@ -623,10 +623,7 @@
     curr_name = get_person_from_config()
     if curr_name != username:
         config = get_config()
-        if not config.has_section("reviews"):
-            config.add_section("reviews")
-        config.set("reviews", "username", username)
-        config.write()
+        config.reviews_username = username
         # refresh usefulness cache in the background once we know
         # the person
         from backend.reviews import UsefulnessCache
@@ -638,9 +635,7 @@
     """ get the username value for Ubuntu SSO from the config file
     """
     cfg = get_config()
-    if cfg.has_option("reviews", "username"):
-        return cfg.get("reviews", "username")
-    return None
+    return cfg.reviews_username
 
 
 def pnormaldist(qn):

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2012-09-07 13:34:37 +0000
+++ tests/test_utils.py	2012-11-22 13:18:26 +0000
@@ -151,7 +151,7 @@
     def test_get_uuid(self):
         uuid = get_uuid()
         self.assertTrue(uuid and len(uuid) > 0)
-        
+
     def test_get_recommender_uuid(self):
         uuid = get_recommender_uuid()
         self.assertTrue("-" not in uuid and len(uuid) > 0)
@@ -196,7 +196,7 @@
         self.assertEqual(capitalize_first_word(""), "")
 
     @unittest.skipIf(
-        os.getuid() == 0, 
+        os.getuid() == 0,
         "fails when run as root as os.access() is always successful")
     def test_ensure_file_writable_and_delete_if_not(self):
         # first test that a non-writable file (0400) is deleted
@@ -213,7 +213,7 @@
         self.assertTrue(os.path.exists(test_file_writeable.name))
 
     @unittest.skipIf(
-        os.getuid() == 0, 
+        os.getuid() == 0,
         "fails when run as root as os.chmod() is always successful")
     def test_safe_makedirs(self):
         tmp = mkdtemp()
@@ -311,6 +311,11 @@
             for i in range(64*1024):
                 l.append(i)
 
+    def test_save_person_to_config(self):
+        from softwarecenter.utils import (
+            save_person_to_config, get_person_from_config)
+        save_person_to_config("meep")
+        self.assertEqual(get_person_from_config(), "meep")
 
 if __name__ == "__main__":
     unittest.main()