Merge remote branch 'cros/upstream' into tempbranch

client/common_lib/global_config_unittest.py

 #!/usr/bin/python
 
 import os, sys, unittest, types
 import common
 from autotest_lib.client.common_lib import global_config
 from autotest_lib.client.common_lib import autotemp
 
 
 global_config_ini_contents = """
 [SECTION_A]
@@ skipping 17 matching lines @@
 shadow_config_ini_contents = """
 [SECTION_C]
 value_1: somebody@remotehost
 """
 
 
 def create_config_files():
     global_temp = autotemp.tempfile("global", ".ini",
                                             text=True)
     os.write(global_temp.fd, global_config_ini_contents)
-    os.close(global_temp.fd)
 
     shadow_temp = autotemp.tempfile("shadow", ".ini",
                                            text=True)
     fd = shadow_temp.fd
     os.write(shadow_temp.fd, shadow_config_ini_contents)
-    os.close(shadow_temp.fd)
 
     return (global_temp, shadow_temp)
 
 
 class global_config_test(unittest.TestCase):
     # grab the singelton
     conf = global_config.global_config
 
     def setUp(self):
         # set the config files to our test files
@@ skipping 61 matching lines @@
         val = self.conf.get_config_value("MISSING", "foo", float, 3.6)
         self.assertEquals(val, 3.6)
         val = self.conf.get_config_value("SECTION_A", "novalue", str,
                                                 "default")
         self.assertEquals(val, "default")
 
 
 # this is so the test can be run in standalone mode
 if __name__ == '__main__':
     unittest.main()