Merge remote branch 'autotest-upstream/master' into autotest-merge

tko/parsers/version_1_unittest.py

 #!/usr/bin/python
 
 import unittest, datetime, time
 
 import common
 from autotest_lib.client.common_lib import utils
 from autotest_lib.tko.parsers import version_1
 
 
 class test_status_line(unittest.TestCase):
@@ skipping 117 matching lines @@
         self.assertEquals(line, None)
         line = version_1.status_line.parse_line(complete_data)
         self.assertEquals(line.indent, 2)
         self.assertEquals(line.type, "STATUS")
         self.assertEquals(line.status, "GOOD")
         self.assertEquals(line.subdir, "field")
         self.assertEquals(line.testname, "second field")
         self.assertEquals(line.reason, "needed last field")
         self.assertEquals(line.optional_fields, {})
 
-
-    def test_parse_line_fails_on_bad_optional_fields(self):
-        input_data = "GOOD\tfield1\tfield2\tfield3\tfield4"
-        self.assertRaises(AssertionError,
-                          version_1.status_line.parse_line,
-                          input_data)
+    # with dalecurtis' change
+    # http://git.chromium.org/gitweb/?p=autotest.git;a=commitdiff;h=e8dac7a116f39ab5a20c3dcb15bab4446fcfbb81
+    # this test becomes no longer valid.
+    # def test_parse_line_fails_on_bad_optional_fields(self):
+    #    input_data = "GOOD\tfield1\tfield2\tfield3\tfield4"
+    #    self.assertRaises(AssertionError,
+    #                      version_1.status_line.parse_line,
+    #                      input_data)
 
 
     def test_good_reboot_passes_success_test(self):
         line = version_1.status_line(0, "NOSTATUS", None, "reboot",
                                      "reboot success", {})
         self.assertEquals(line.is_successful_reboot("GOOD"), True)
         self.assertEquals(line.is_successful_reboot("WARN"), True)
 
 
     def test_bad_reboot_passes_success_test(self):
@@ skipping 114 matching lines @@
     def test_make_dummy_abort_no_timestamp(self):
         abort = version_1.parser.make_dummy_abort(
             self.indent, None, self.testname, None, self.reason)
         self.assertEquals(
             abort, '%sEND ABORT\t----\t%s\t%s' % (
             '\t'*self.indent, self.testname, self.reason))
 
 
 if __name__ == "__main__":
     unittest.main()