Fix cloud policy duplicate registrations issue.

net/tools/testserver/device_management.py

Index: net/tools/testserver/device_management.py
diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py
index bbfb3c5ff08871773c7a0b29c3a130201a6a2bd4..5f812b18aa4f13ba1744f1c9e0d6b3efc9f559c9 100644
--- a/net/tools/testserver/device_management.py
+++ b/net/tools/testserver/device_management.py
@@ -90,6 +90,11 @@ BAD_MACHINE_IDS = [ '123490EN400015' ];
 # for the register request.
 KIOSK_MACHINE_IDS = [ 'KIOSK' ];
 
+# A special authentication token whose register request must have the
+# re-register flag set. If that flag is not set when a register request with
+# this token is received then the register is refused.
+RE_REGISTER_MAGIC_TOKEN = 'reregistertoken'
+
 class RequestHandler(object):
   """Decodes and handles device management requests from clients.
 
@@ -211,6 +216,10 @@ class RequestHandler(object):
     if not device_id:
       return (400, 'Missing device identifier')
 
+    if (auth == RE_REGISTER_MAGIC_TOKEN and
+        msg.reregister != True):
+      return (400, 'Expected reregister request')

[Mattias Nissler (ping if slow), 2013/02/11 18:23:50]

I'm concerned that we keep adding weirdness to the test server to the point
where the code becomes completely incomprehensible.

[Joao da Silva, 2013/02/12 16:33:41]

Reverted.

+
     token_info = self._server.RegisterDevice(device_id,
                                              msg.machine_id,
                                              msg.type)