Merge pull request #173 from mozilla-services/remember-keyschangedat-…

…after-node-replacement; r=jrconlin

fix: remember keys_changed_at when reallocating after node replacement.

tokenserver/assignment/sqlnode/sql.py

@@ -316,7 +316,8 @@ def get_user(self, service, email):
                 if cur_row.generation < MAX_GENERATION:
                     user = self.allocate_user(service, email,
                                               cur_row.generation,
-                                              cur_row.client_state)
+                                              cur_row.client_state,
+                                              cur_row.keys_changed_at)
             for old_row in old_rows:
                 # Collect any previously-seen client-state values.
                 if old_row.client_state != user['client_state']:

tokenserver/tests/assignment/test_sqlnode.py

@@ -197,12 +197,17 @@ def test_cleanup_of_old_records(self):
 
     def test_node_reassignment_when_records_are_replaced(self):
         self.backend.allocate_user("sync-1.0", "[email protected]",
-                                   generation=42, client_state="aaa")
+                                   generation=42,
+                                   keys_changed_at=12,
+                                   client_state="aaa")
         user1 = self.backend.get_user("sync-1.0", "[email protected]")
         self.backend.replace_user_records("sync-1.0", "[email protected]")
         user2 = self.backend.get_user("sync-1.0", "[email protected]")
+        # They should have got a new uid.
         self.assertNotEqual(user2["uid"], user1["uid"])
+        # But their account metadata should have been preserved.
         self.assertEqual(user2["generation"], user1["generation"])
+        self.assertEqual(user2["keys_changed_at"], user1["keys_changed_at"])
         self.assertEqual(user2["client_state"], user1["client_state"])
 
     def test_node_reassignment_not_done_for_retired_users(self):