Merge remote branch 'cros/upstream' into tempbranch

client/common_lib/control_data_unittest.py

 #!/usr/bin/python
 
 import os, sys, unittest
 import common
 from autotest_lib.client.common_lib import control_data, autotemp
 
 ControlData = control_data.ControlData
 
 CONTROL = """
 AUTHOR = 'Author'
 DEPENDENCIES = "console, power"
 DOC = \"\"\"\
 doc stuff\"\"\"
 # EXPERIMENTAL should implicitly be False
 NAME = 'nA' "mE"
 RUN_VERIFY = False
 SYNC_COUNT = 2
 TIME='short'
 TEST_CLASS=u'Kernel'
 TEST_CATEGORY='Stress'
 TEST_TYPE='client'
 """
 
 
 class ParseControlTest(unittest.TestCase):
     def setUp(self):
         self.control_tmp = autotemp.tempfile(unique_id='control_unit',
                                              text=True)
         os.write(self.control_tmp.fd, CONTROL)
-        os.close(self.control_tmp.fd)
 
 
     def tearDown(self):
         self.control_tmp.clean()
 
 
     def test_parse_control(self):
         cd = control_data.parse_control(self.control_tmp.name, True)
         self.assertEquals(cd.author, "Author")
         self.assertEquals(cd.dependencies, set(['console', 'power']))
@@ skipping 92 matching lines @@
                           'foo', 1, options)
         self.assertRaises(ValueError, cd._set_option,
                           'foo', [], options)
         self.assertRaises(ValueError, cd._set_option,
                           'foo', None, options)
 
 
 # this is so the test can be run in standalone mode
 if __name__ == '__main__':
     unittest.main()