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

tko/parsers/version_0_unittest.py

Index: tko/parsers/version_0_unittest.py
diff --git a/tko/parsers/version_0_unittest.py b/tko/parsers/version_0_unittest.py
index 286e5bb2f735e5e904095def00678c540cd55125..7363e3c6ffcd8630d119ea5f2cc09df515804ab9 100755
--- a/tko/parsers/version_0_unittest.py
+++ b/tko/parsers/version_0_unittest.py
@@ -287,6 +287,15 @@ class test_status_line(unittest.TestCase):
         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()