Convert all python code to use four-space indents instead of eight-space tabs.
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1658 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tko/parsers/version_1_unittest.py b/tko/parsers/version_1_unittest.py
index eb3ad37..33077c6 100644
--- a/tko/parsers/version_1_unittest.py
+++ b/tko/parsers/version_1_unittest.py
@@ -7,187 +7,187 @@
class test_status_line(unittest.TestCase):
- statuses = ["GOOD", "WARN", "FAIL", "ABORT"]
+ statuses = ["GOOD", "WARN", "FAIL", "ABORT"]
- def test_handles_start(self):
- line = version_1.status_line(0, "START", "----", "test",
- "", {})
- self.assertEquals(line.type, "START")
- self.assertEquals(line.status, None)
+ def test_handles_start(self):
+ line = version_1.status_line(0, "START", "----", "test",
+ "", {})
+ self.assertEquals(line.type, "START")
+ self.assertEquals(line.status, None)
- def test_handles_status(self):
- for stat in self.statuses:
- line = version_1.status_line(0, stat, "----", "test",
- "", {})
- self.assertEquals(line.type, "STATUS")
- self.assertEquals(line.status, stat)
+ def test_handles_status(self):
+ for stat in self.statuses:
+ line = version_1.status_line(0, stat, "----", "test",
+ "", {})
+ self.assertEquals(line.type, "STATUS")
+ self.assertEquals(line.status, stat)
- def test_handles_endstatus(self):
- for stat in self.statuses:
- line = version_1.status_line(0, "END " + stat, "----",
- "test", "", {})
- self.assertEquals(line.type, "END")
- self.assertEquals(line.status, stat)
+ def test_handles_endstatus(self):
+ for stat in self.statuses:
+ line = version_1.status_line(0, "END " + stat, "----",
+ "test", "", {})
+ self.assertEquals(line.type, "END")
+ self.assertEquals(line.status, stat)
- def test_fails_on_bad_status(self):
- for stat in self.statuses:
- self.assertRaises(AssertionError,
- version_1.status_line, 0,
- "BAD " + stat, "----", "test",
- "", {})
+ def test_fails_on_bad_status(self):
+ for stat in self.statuses:
+ self.assertRaises(AssertionError,
+ version_1.status_line, 0,
+ "BAD " + stat, "----", "test",
+ "", {})
- def test_saves_all_fields(self):
- line = version_1.status_line(5, "GOOD", "subdir_name",
- "test_name", "my reason here",
- {"key1": "value",
- "key2": "another value",
- "key3": "value3"})
- self.assertEquals(line.indent, 5)
- self.assertEquals(line.status, "GOOD")
- self.assertEquals(line.subdir, "subdir_name")
- self.assertEquals(line.testname, "test_name")
- self.assertEquals(line.reason, "my reason here")
- self.assertEquals(line.optional_fields,
- {"key1": "value", "key2": "another value",
- "key3": "value3"})
+ def test_saves_all_fields(self):
+ line = version_1.status_line(5, "GOOD", "subdir_name",
+ "test_name", "my reason here",
+ {"key1": "value",
+ "key2": "another value",
+ "key3": "value3"})
+ self.assertEquals(line.indent, 5)
+ self.assertEquals(line.status, "GOOD")
+ self.assertEquals(line.subdir, "subdir_name")
+ self.assertEquals(line.testname, "test_name")
+ self.assertEquals(line.reason, "my reason here")
+ self.assertEquals(line.optional_fields,
+ {"key1": "value", "key2": "another value",
+ "key3": "value3"})
- def test_parses_blank_subdir(self):
- line = version_1.status_line(0, "GOOD", "----", "test",
- "", {})
- self.assertEquals(line.subdir, None)
+ def test_parses_blank_subdir(self):
+ line = version_1.status_line(0, "GOOD", "----", "test",
+ "", {})
+ self.assertEquals(line.subdir, None)
- def test_parses_blank_testname(self):
- line = version_1.status_line(0, "GOOD", "subdir", "----",
- "", {})
- self.assertEquals(line.testname, None)
+ def test_parses_blank_testname(self):
+ line = version_1.status_line(0, "GOOD", "subdir", "----",
+ "", {})
+ self.assertEquals(line.testname, None)
- def test_parse_line_smoketest(self):
- input_data = ("\t\t\tGOOD\t----\t----\t"
- "field1=val1\tfield2=val2\tTest Passed")
- line = version_1.status_line.parse_line(input_data)
- self.assertEquals(line.indent, 3)
- self.assertEquals(line.type, "STATUS")
- self.assertEquals(line.status, "GOOD")
- self.assertEquals(line.subdir, None)
- self.assertEquals(line.testname, None)
- self.assertEquals(line.reason, "Test Passed")
- self.assertEquals(line.optional_fields,
- {"field1": "val1", "field2": "val2"})
+ def test_parse_line_smoketest(self):
+ input_data = ("\t\t\tGOOD\t----\t----\t"
+ "field1=val1\tfield2=val2\tTest Passed")
+ line = version_1.status_line.parse_line(input_data)
+ self.assertEquals(line.indent, 3)
+ self.assertEquals(line.type, "STATUS")
+ self.assertEquals(line.status, "GOOD")
+ self.assertEquals(line.subdir, None)
+ self.assertEquals(line.testname, None)
+ self.assertEquals(line.reason, "Test Passed")
+ self.assertEquals(line.optional_fields,
+ {"field1": "val1", "field2": "val2"})
- def test_parse_line_handles_newline(self):
- input_data = ("\t\tGOOD\t----\t----\t"
- "field1=val1\tfield2=val2\tNo newline here!")
- for suffix in ("", "\n"):
- line = version_1.status_line.parse_line(input_data +
- suffix)
- self.assertEquals(line.indent, 2)
- self.assertEquals(line.type, "STATUS")
- self.assertEquals(line.status, "GOOD")
- self.assertEquals(line.subdir, None)
- self.assertEquals(line.testname, None)
- self.assertEquals(line.reason, "No newline here!")
- self.assertEquals(line.optional_fields,
- {"field1": "val1",
- "field2": "val2"})
+ def test_parse_line_handles_newline(self):
+ input_data = ("\t\tGOOD\t----\t----\t"
+ "field1=val1\tfield2=val2\tNo newline here!")
+ for suffix in ("", "\n"):
+ line = version_1.status_line.parse_line(input_data +
+ suffix)
+ self.assertEquals(line.indent, 2)
+ self.assertEquals(line.type, "STATUS")
+ self.assertEquals(line.status, "GOOD")
+ self.assertEquals(line.subdir, None)
+ self.assertEquals(line.testname, None)
+ self.assertEquals(line.reason, "No newline here!")
+ self.assertEquals(line.optional_fields,
+ {"field1": "val1",
+ "field2": "val2"})
- def test_parse_line_fails_on_untabbed_lines(self):
- input_data = " GOOD\trandom\tfields\tof text"
- line = version_1.status_line.parse_line(input_data)
- self.assertEquals(line, None)
- line = version_1.status_line.parse_line(input_data.lstrip())
- self.assertEquals(line.indent, 0)
- self.assertEquals(line.type, "STATUS")
- self.assertEquals(line.status, "GOOD")
- self.assertEquals(line.subdir, "random")
- self.assertEquals(line.testname, "fields")
- self.assertEquals(line.reason, "of text")
- self.assertEquals(line.optional_fields, {})
+ def test_parse_line_fails_on_untabbed_lines(self):
+ input_data = " GOOD\trandom\tfields\tof text"
+ line = version_1.status_line.parse_line(input_data)
+ self.assertEquals(line, None)
+ line = version_1.status_line.parse_line(input_data.lstrip())
+ self.assertEquals(line.indent, 0)
+ self.assertEquals(line.type, "STATUS")
+ self.assertEquals(line.status, "GOOD")
+ self.assertEquals(line.subdir, "random")
+ self.assertEquals(line.testname, "fields")
+ self.assertEquals(line.reason, "of text")
+ 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)
+ 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_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):
- line = version_1.status_line(0, "NOSTATUS", None, "reboot",
- "reboot success", {})
- self.assertEquals(line.is_successful_reboot("FAIL"), False)
- self.assertEquals(line.is_successful_reboot("ABORT"), False)
+ def test_bad_reboot_passes_success_test(self):
+ line = version_1.status_line(0, "NOSTATUS", None, "reboot",
+ "reboot success", {})
+ self.assertEquals(line.is_successful_reboot("FAIL"), False)
+ self.assertEquals(line.is_successful_reboot("ABORT"), False)
- def test_get_kernel_returns_kernel_plus_patches(self):
- line = version_1.status_line(0, "GOOD", "subdir", "testname",
- "reason text",
- {"kernel": "2.6.24-rc40",
- "patch0": "first_patch 0 0",
- "patch1": "another_patch 0 0"})
- kern = line.get_kernel()
- kernel_hash = md5.new("2.6.24-rc40,0,0").hexdigest()
- self.assertEquals(kern.base, "2.6.24-rc40")
- self.assertEquals(kern.patches[0].spec, "first_patch")
- self.assertEquals(kern.patches[1].spec, "another_patch")
- self.assertEquals(len(kern.patches), 2)
- self.assertEquals(kern.kernel_hash, kernel_hash)
+ def test_get_kernel_returns_kernel_plus_patches(self):
+ line = version_1.status_line(0, "GOOD", "subdir", "testname",
+ "reason text",
+ {"kernel": "2.6.24-rc40",
+ "patch0": "first_patch 0 0",
+ "patch1": "another_patch 0 0"})
+ kern = line.get_kernel()
+ kernel_hash = md5.new("2.6.24-rc40,0,0").hexdigest()
+ self.assertEquals(kern.base, "2.6.24-rc40")
+ self.assertEquals(kern.patches[0].spec, "first_patch")
+ self.assertEquals(kern.patches[1].spec, "another_patch")
+ self.assertEquals(len(kern.patches), 2)
+ self.assertEquals(kern.kernel_hash, kernel_hash)
- def test_get_kernel_ignores_out_of_sequence_patches(self):
- line = version_1.status_line(0, "GOOD", "subdir", "testname",
- "reason text",
- {"kernel": "2.6.24-rc40",
- "patch0": "first_patch 0 0",
- "patch2": "another_patch 0 0"})
- kern = line.get_kernel()
- kernel_hash = md5.new("2.6.24-rc40,0").hexdigest()
- self.assertEquals(kern.base, "2.6.24-rc40")
- self.assertEquals(kern.patches[0].spec, "first_patch")
- self.assertEquals(len(kern.patches), 1)
- self.assertEquals(kern.kernel_hash, kernel_hash)
+ def test_get_kernel_ignores_out_of_sequence_patches(self):
+ line = version_1.status_line(0, "GOOD", "subdir", "testname",
+ "reason text",
+ {"kernel": "2.6.24-rc40",
+ "patch0": "first_patch 0 0",
+ "patch2": "another_patch 0 0"})
+ kern = line.get_kernel()
+ kernel_hash = md5.new("2.6.24-rc40,0").hexdigest()
+ self.assertEquals(kern.base, "2.6.24-rc40")
+ self.assertEquals(kern.patches[0].spec, "first_patch")
+ self.assertEquals(len(kern.patches), 1)
+ self.assertEquals(kern.kernel_hash, kernel_hash)
- def test_get_kernel_returns_unknown_with_no_kernel(self):
- line = version_1.status_line(0, "GOOD", "subdir", "testname",
- "reason text",
- {"patch0": "first_patch 0 0",
- "patch2": "another_patch 0 0"})
- kern = line.get_kernel()
- self.assertEquals(kern.base, "UNKNOWN")
- self.assertEquals(kern.patches, [])
- self.assertEquals(kern.kernel_hash, "UNKNOWN")
+ def test_get_kernel_returns_unknown_with_no_kernel(self):
+ line = version_1.status_line(0, "GOOD", "subdir", "testname",
+ "reason text",
+ {"patch0": "first_patch 0 0",
+ "patch2": "another_patch 0 0"})
+ kern = line.get_kernel()
+ self.assertEquals(kern.base, "UNKNOWN")
+ self.assertEquals(kern.patches, [])
+ self.assertEquals(kern.kernel_hash, "UNKNOWN")
- def test_get_timestamp_returns_timestamp_field(self):
- timestamp = datetime.datetime(1970, 1, 1, 4, 30)
- timestamp -= datetime.timedelta(seconds=time.timezone)
- line = version_1.status_line(0, "GOOD", "subdir", "testname",
- "reason text",
- {"timestamp": "16200"})
- self.assertEquals(timestamp, line.get_timestamp())
+ def test_get_timestamp_returns_timestamp_field(self):
+ timestamp = datetime.datetime(1970, 1, 1, 4, 30)
+ timestamp -= datetime.timedelta(seconds=time.timezone)
+ line = version_1.status_line(0, "GOOD", "subdir", "testname",
+ "reason text",
+ {"timestamp": "16200"})
+ self.assertEquals(timestamp, line.get_timestamp())
- def test_get_timestamp_returns_none_on_missing_field(self):
- line = version_1.status_line(0, "GOOD", "subdir", "testname",
- "reason text", {})
- self.assertEquals(None, line.get_timestamp())
+ def test_get_timestamp_returns_none_on_missing_field(self):
+ line = version_1.status_line(0, "GOOD", "subdir", "testname",
+ "reason text", {})
+ self.assertEquals(None, line.get_timestamp())
if __name__ == "__main__":
- unittest.main()
+ unittest.main()