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

tko/parsers/version_0_unittest.py

 #!/usr/bin/python
 
 import unittest
 
 import common
 from autotest_lib.client.common_lib.test_utils import mock
 from autotest_lib.tko import models
 from autotest_lib.tko.parsers import version_0
 
 
@@ skipping 269 matching lines @@
         line = version_0.status_line.parse_line(input_data)
         self.assertEquals(line.indent, 1)
         self.assertEquals(line.type, "END")
         self.assertEquals(line.status, "FAIL")
         self.assertEquals(line.subdir, None)
         self.assertEquals(line.testname, "test")
         self.assertEquals(line.reason, "Reason with\ta\tcouple\ttabs")
         self.assertEquals(line.optional_fields, {"field1": "val1",
                                                  "field2": "val2"})
 
+    # 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_0.status_line.parse_line,
+    #                      input_data)
+
 
 if __name__ == "__main__":
     unittest.main()