Merge remote branch 'cros/upstream' into tempbranch

cli/cli_mock.py

 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
 """Test for cli."""
 
 import unittest, os, sys, StringIO
 
 import common
 from autotest_lib.cli import atest, topic_common, rpc
 from autotest_lib.frontend.afe import rpc_client_lib
 from autotest_lib.frontend.afe.json_rpc import proxy
 from autotest_lib.client.common_lib.test_utils import mock
 from autotest_lib.client.common_lib import autotemp
 
 CLI_USING_PDB = False
 CLI_UT_DEBUG = False
 
 def create_file(content):
     file_temp = autotemp.tempfile(unique_id='cli_mock', text=True)
     os.write(file_temp.fd, content)
-    os.close(file_temp.fd)
     return file_temp
 
 
 class ExitException(Exception):
     pass
 
 
 class cli_unittest(unittest.TestCase):
     def setUp(self):
         super(cli_unittest, self).setUp()
@@ skipping 80 matching lines @@
         if exit_code is not None:
             sys.exit.expect_call(exit_code).and_raises(ExitException)
             self.assertRaises(ExitException, atest.main)
         else:
             atest.main()
         (out, err) = self.god.unmock_io()
         self.god.check_playback()
         self._check_output(out, out_words_ok, out_words_no,
                            err, err_words_ok, err_words_no)
         return (out, err)