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 61 matching lines @@
 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:
+    logging.error('Could not import json')

[Mattias Nissler (ping if slow), 2015/05/18 13:29:17]

I think it's meanwhile fine to just import json unconditionally. This code dates
back to a time when we couldn't assume the bots to have a json module available.
I suggest you remove the try-except here entirely and move the import json
statement to the other imports above. If the trybots like it, it's fine and this
hack can go away.

     json = None
 
 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:
+  logging.error('Could not import chrome_extension_policy_pb2')

[Mattias Nissler (ping if slow), 2015/05/18 13:29:17]

This will add log spew I guess. A better way of doing this might be to move the
imports to the point where these protobufs actually get used?

   ep = None
 
 # Device policy is only available on Chrome OS builds.
 try:
   import chrome_device_policy_pb2 as dp
 except ImportError:
+  logging.error('Could not import chrome_device_policy_pb2')
   dp = None
 
 # ASN.1 object identifier for PKCS#1/RSA.
 PKCS1_RSA_OID = '\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01'
 
 # List of bad machine identifiers that trigger the |valid_serial_number_missing|
 # flag to be set set in the policy fetch response.
 BAD_MACHINE_IDS = [ '123490EN400015' ]
 
 # List of machines that trigger the server to send kiosk enrollment response
@@ skipping 869 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())