Merge remote branch 'cros/upstream' into master

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 202 matching lines @@
 
 
 class iteration_parse_line_into_dicts(unittest.TestCase):
     def parse_line(self, line):
         attr, perf = {}, {}
         version_1.iteration.parse_line_into_dicts(line, attr, perf)
         return attr, perf
 
 
     def test_perf_entry(self):
-        result = self.parse_line("perf-val{perf}=173")
-        self.assertEqual(({}, {"perf-val": 173}), result)
+        result = self.parse_line("perf-val{perf}=-173")
+        self.assertEqual(({}, {"perf-val": -173}), result)
 
 
     def test_attr_entry(self):
         result = self.parse_line("attr-val{attr}=173")
         self.assertEqual(({"attr-val": "173"}, {}), result)
 
 
     def test_untagged_is_perf(self):
-        result = self.parse_line("untagged=678.5")
-        self.assertEqual(({}, {"untagged": 678.5}), result)
+        result = self.parse_line("untagged=-678.5e5")
+        self.assertEqual(({}, {"untagged": -678.5e5}), result)
 
 
     def test_invalid_tag_ignored(self):
         result = self.parse_line("bad-tag{invalid}=56")
         self.assertEqual(({}, {}), result)
 
 
     def test_non_numeric_perf_ignored(self):
-        result = self.parse_line("perf-val{perf}=NaN")
+        result = self.parse_line("perf-val{perf}=FooBar")
         self.assertEqual(({}, {}), result)
 
 
     def test_non_numeric_untagged_ignored(self):
-        result = self.parse_line("untagged=NaN")
+        result = self.parse_line("untagged=FooBar")
         self.assertEqual(({}, {}), result)
 
 
 class DummyAbortTestCase(unittest.TestCase):
     def setUp(self):
         self.indent = 3
         self.testname = 'testname'
         self.timestamp = 1220565792
         self.reason = 'Job aborted unexpectedly'
 
 
     def test_make_dummy_abort_with_timestamp(self):
         abort = version_1.parser.make_dummy_abort(
             self.indent, None, self.testname, self.timestamp, self.reason)
         self.assertEquals(
             abort, '%sEND ABORT\t----\t%s\ttimestamp=%d\t%s' % (
             '\t'*self.indent, self.testname, self.timestamp, self.reason))
 
 
     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()