Merge remote branch 'cros/upstream' into master.

frontend/afe/frontend_test_utils.py

 import atexit, datetime, os, tempfile, unittest
 import common
 from autotest_lib.frontend import setup_test_environment
 from autotest_lib.frontend import thread_local
 from autotest_lib.frontend.afe import models, model_attributes
 from autotest_lib.client.common_lib import global_config
 from autotest_lib.client.common_lib.test_utils import mock
 
 class FrontendTestMixin(object):
     def _fill_in_test_data(self):
@@ skipping 50 matching lines @@
             self.hosts[hostnum].labels.add(self.label5)  # an atomic group lavel
             self.hosts[hostnum].labels.add(self.label6)  # a normal label
             self.hosts[hostnum].labels.add(self.label7)
 
 
     def _frontend_common_setup(self, fill_data=True):
         self.god = mock.mock_god(ut=self)
         setup_test_environment.set_up()
         global_config.global_config.override_config_value(
                 'AUTOTEST_WEB', 'parameterized_jobs', 'False')
+        global_config.global_config.override_config_value(
+                'SERVER', 'rpc_logging', 'False')
+
         if fill_data:
             self._fill_in_test_data()
 
 
     def _frontend_common_teardown(self):
         setup_test_environment.tear_down()
         thread_local.set_user(None)
         self.god.unstub_all()
 
 
@@ skipping 62 matching lines @@
     def _create_job_simple(self, hosts, use_metahost=False,
                           priority=0, active=False, drone_set=None):
         """An alternative interface to _create_job"""
         args = {'hosts' : [], 'metahosts' : []}
         if use_metahost:
             args['metahosts'] = hosts
         else:
             args['hosts'] = hosts
         return self._create_job(priority=priority, active=active,
                                 drone_set=drone_set, **args)