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

tko/parsers/version_1_unittest.py

Index: tko/parsers/version_1_unittest.py
diff --git a/tko/parsers/version_1_unittest.py b/tko/parsers/version_1_unittest.py
index 4114c59cc9415ec93f46c9ae3d023f04a8687b2f..06ee9b37dd65b144ff301d9b9dc63a705feb9a7c 100755
--- a/tko/parsers/version_1_unittest.py
+++ b/tko/parsers/version_1_unittest.py
@@ -135,12 +135,14 @@ class test_status_line(unittest.TestCase):
         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):