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 42 matching lines @@
 }
 
 """
 
 import base64
 import BaseHTTPServer
 import cgi
 import glob
 import google.protobuf.text_format
 import hashlib
+import json
 import logging
 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:
-    logging.error('Could not import json')
-    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')
   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 630 matching lines @@
       if msg.policy_type in ('google/android/user',
                              'google/chromeos/publicaccount',
                              'google/chromeos/user',
                              'google/chrome/user',
                              'google/ios/user'):
         settings = cp.CloudPolicySettings()
         payload = self.server.ReadPolicyFromDataDir(policy_key, settings)
         if payload is None:
           self.GatherUserPolicySettings(settings, policy.get(policy_key, {}))
           payload = settings.SerializeToString()
-      elif dp is not None and msg.policy_type == 'google/chromeos/device':
+      elif msg.policy_type == 'google/chromeos/device':
         settings = dp.ChromeDeviceSettingsProto()
         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':
+      elif 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:
         response.error_code = 400
         response.error_message = 'Invalid policy type'
         return
     else:
       response.error_code = 400
@@ skipping 517 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())