Small bug fix in get_all_column_names() in layout test analyzer. When if include_other_fields is false, return_list should not include the OTHER_FIELD_NAME.

Review URL: http://codereview.chromium.org/7518038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95086 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 0 deletions

diff --git a/media/tools/layout_tests/test_expectations_unittest.py b/media/tools/layout_tests/test_expectations_unittest.py
index d7ea03c..7979561 100755
--- a/media/tools/layout_tests/test_expectations_unittest.py
+++ b/media/tools/layout_tests/test_expectations_unittest.py
@@ -200,6 +200,23 @@ class TestTestExpectationsManager(unittest.TestCase):
             now, past, ['media/audio-repaint.html'], -1, False)
         self.assertTrue(result_list is not None)
 
+    def test_get_all_column_names_no_other_field(self):
+        test_expectations_manager = TestExpectationsManager()
+        column_names = test_expectations_manager.get_all_column_names(False,
+                                                                      True)
+        other_field_column_names = test_expectations_manager.OTHER_FIELD_NAMES
+        for other_field_column_name in other_field_column_names:
+            self.assertFalse(other_field_column_name in column_names)
+
+    def test_get_all_column_names_no_comment_field(self):
+        test_expectations_manager = TestExpectationsManager()
+        column_names = test_expectations_manager.get_all_column_names(True,
+                                                                      False)
+        other_field_column_names = (
+            test_expectations_manager.COMMENT_COLUMN_NAMES)
+        for other_field_column_name in other_field_column_names:
+            self.assertFalse(other_field_column_name in column_names)
+
 
 def main():
     test_suite = unittest.TestLoader().loadTestsFromTestCase(