Added log messages for cases of failure of open files in policy_testserver.py.

chrome/browser/policy/test/policy_testserver.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A bare-bones test server for testing cloud policy support.
 
 This implements a simple cloud policy test server that can be used to test
 chrome's device management service client. The policy information is read from
 the file named device_management in the server's data directory. It contains
 enforced and recommended policies for the device and user scope, and a list
@@ skipping 53 matching lines @@
 import os
 import random
 import re
 import sys
 import time
 import tlslite
 import tlslite.api
 import tlslite.utils
 import tlslite.utils.cryptomath
 import urlparse
-
-# The name and availability of the json module varies in python versions.
-try:
-  import simplejson as json
-except ImportError:
-  try:
-    import json
-  except ImportError:
-    json = None
-
+import json

[Mattias Nissler (ping if slow), 2015/06/15 07:47:18]

alphabetize

 import asn1der
 import testserver_base
 
 import device_management_backend_pb2 as dm
 import cloud_policy_pb2 as cp
 
 # Policy for extensions is not supported on Android nor iOS.
 try:
   import chrome_extension_policy_pb2 as ep
 except ImportError:
@@ skipping 658 matching lines @@
         payload = self.server.ReadPolicyFromDataDir(policy_key, settings)
         if payload is None:
           self.GatherDevicePolicySettings(settings, policy.get(policy_key, {}))
           payload = settings.SerializeToString()
       elif ep is not None and msg.policy_type == 'google/chrome/extension':
         settings = ep.ExternalPolicyData()
         payload = self.server.ReadPolicyFromDataDir(policy_key, settings)
         if payload is None:
           payload = self.CreatePolicyForExternalPolicyData(policy_key)
       else:
+        if ep is None:
+          logging.error('chrome_extension_policy_pb2 does not exist')
+        if dp is None:
+          logging.error('chrome_device_policy_pb2 does not exist')

[Mattias Nissler (ping if slow), 2015/06/15 07:47:18]

Why not just drop the ep is None and dp is None checks above? The test server
will noisily crash then, which seems appropriate?

         response.error_code = 400
         response.error_message = 'Invalid policy type'
         return
     else:
       response.error_code = 400
       response.error_message = 'Request not allowed for the token used'
       return
 
     # Sign with 'current_key_index', defaulting to key 0.
     signing_key = None
@@ skipping 207 matching lines @@
         self._registered_tokens = json.loads(file_contents, strict=False)
       except IOError:
         pass
 
   def GetPolicies(self):
     """Returns the policies to be used, reloaded form the backend file every
        time this is called.
     """
     policy = {}
     if json is None:
-      print 'No JSON module, cannot parse policy information'
+      logging.error('No JSON module, cannot parse policy information')
     else :
       try:
         policy = json.loads(open(self.policy_path).read(), strict=False)
       except IOError:
-        print 'Failed to load policy from %s' % self.policy_path
+        logging.error('Failed to load policies from %s' % self.policy_path)
     return policy
 
   def RegisterDevice(self, device_id, machine_id, type):
     """Registers a device or user and generates a DM token for it.
 
     Args:
       device_id: The device identifier provided by the client.
 
     Returns:
       The newly generated device token for the device.
@@ skipping 279 matching lines @@
     if (self.options.log_to_console):
       logger.addHandler(logging.StreamHandler())
     if (self.options.log_file):
       logger.addHandler(logging.FileHandler(self.options.log_file))
 
     testserver_base.TestServerRunner.run_server(self)
 
 
 if __name__ == '__main__':
   sys.exit(PolicyServerRunner().main())