| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 self.parse_exp(self.get_basic_expectations()) | 178 self.parse_exp(self.get_basic_expectations()) |
| 179 s = self._exp.get_test_set(WONTFIX) | 179 s = self._exp.get_test_set(WONTFIX) |
| 180 self.assertEqual(s, | 180 self.assertEqual(s, |
| 181 set([self.get_test('failures/expected/crash.html'), | 181 set([self.get_test('failures/expected/crash.html'), |
| 182 self.get_test('failures/expected/image_checksum.html')])) | 182 self.get_test('failures/expected/image_checksum.html')])) |
| 183 | 183 |
| 184 def test_needs_rebaseline_reftest(self): | 184 def test_needs_rebaseline_reftest(self): |
| 185 try: | 185 try: |
| 186 filesystem = self._port.host.filesystem | 186 filesystem = self._port.host.filesystem |
| 187 filesystem.write_text_file(filesystem.join(self._port.layout_tests_d
ir(), 'failures/expected/needsrebaseline.html'), 'content') | 187 filesystem.write_text_file(filesystem.join(self._port.layout_tests_d
ir(), 'failures/expected/needsrebaseline.html'), 'content') |
| 188 filesystem.write_text_file(filesystem.join(self._port.layout_tests_d
ir(), 'failures/expected/needsrebaseline-expected.html'), 'content') | 188 filesystem.write_text_file(filesystem.join(self._port.layout_tests_d
ir(), 'failures/expected/needsrebaseline-expected.sky'), 'content') |
| 189 filesystem.write_text_file(filesystem.join(self._port.layout_tests_d
ir(), 'failures/expected/needsmanualrebaseline.html'), 'content') | 189 filesystem.write_text_file(filesystem.join(self._port.layout_tests_d
ir(), 'failures/expected/needsmanualrebaseline.html'), 'content') |
| 190 filesystem.write_text_file(filesystem.join(self._port.layout_tests_d
ir(), 'failures/expected/needsmanualrebaseline-expected.html'), 'content') | 190 filesystem.write_text_file(filesystem.join(self._port.layout_tests_d
ir(), 'failures/expected/needsmanualrebaseline-expected.sky'), 'content') |
| 191 self.parse_exp("""Bug(user) failures/expected/needsrebaseline.html [
NeedsRebaseline ] | 191 self.parse_exp("""Bug(user) failures/expected/needsrebaseline.html [
NeedsRebaseline ] |
| 192 Bug(user) failures/expected/needsmanualrebaseline.html [ NeedsManualRebaseline ]
""", is_lint_mode=True) | 192 Bug(user) failures/expected/needsmanualrebaseline.html [ NeedsManualRebaseline ]
""", is_lint_mode=True) |
| 193 self.assertFalse(True, "ParseError wasn't raised") | 193 self.assertFalse(True, "ParseError wasn't raised") |
| 194 except ParseError, e: | 194 except ParseError, e: |
| 195 warnings = """expectations:1 A reftest cannot be marked as NeedsReba
seline/NeedsManualRebaseline failures/expected/needsrebaseline.html | 195 warnings = """expectations:1 A reftest cannot be marked as NeedsReba
seline/NeedsManualRebaseline failures/expected/needsrebaseline.html |
| 196 expectations:2 A reftest cannot be marked as NeedsRebaseline/NeedsManualRebaseli
ne failures/expected/needsmanualrebaseline.html""" | 196 expectations:2 A reftest cannot be marked as NeedsRebaseline/NeedsManualRebaseli
ne failures/expected/needsmanualrebaseline.html""" |
| 197 self.assertEqual(str(e), warnings) | 197 self.assertEqual(str(e), warnings) |
| 198 | 198 |
| 199 def test_parse_warning(self): | 199 def test_parse_warning(self): |
| 200 try: | 200 try: |
| (...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 907 | 907 |
| 908 def disabled_test_string_whitespace_stripping(self): | 908 def disabled_test_string_whitespace_stripping(self): |
| 909 # FIXME: Re-enable this test once we rework the code to no longer suppor
t the old syntax. | 909 # FIXME: Re-enable this test once we rework the code to no longer suppor
t the old syntax. |
| 910 self.assert_round_trip('\n', '') | 910 self.assert_round_trip('\n', '') |
| 911 self.assert_round_trip(' [ FOO ] bar [ BAZ ]', '[ FOO ] bar [ BAZ ]') | 911 self.assert_round_trip(' [ FOO ] bar [ BAZ ]', '[ FOO ] bar [ BAZ ]') |
| 912 self.assert_round_trip('[ FOO ] bar [ BAZ ]', '[ FOO ] bar [ BAZ ]') | 912 self.assert_round_trip('[ FOO ] bar [ BAZ ]', '[ FOO ] bar [ BAZ ]') |
| 913 self.assert_round_trip('[ FOO ] bar [ BAZ ] # Qux.', '[ FOO ] bar
[ BAZ ] # Qux.') | 913 self.assert_round_trip('[ FOO ] bar [ BAZ ] # Qux.', '[ FOO ] bar
[ BAZ ] # Qux.') |
| 914 self.assert_round_trip('[ FOO ] bar [ BAZ ] # Qux.', '[ FOO ] ba
r [ BAZ ] # Qux.') | 914 self.assert_round_trip('[ FOO ] bar [ BAZ ] # Qux.', '[ FOO ] ba
r [ BAZ ] # Qux.') |
| 915 self.assert_round_trip('[ FOO ] bar [ BAZ ] # Qux.', '[ FOO ]
bar [ BAZ ] # Qux.') | 915 self.assert_round_trip('[ FOO ] bar [ BAZ ] # Qux.', '[ FOO ]
bar [ BAZ ] # Qux.') |
| 916 self.assert_round_trip('[ FOO ] bar [ BAZ ] # Qux.', '[ FO
O ] bar [ BAZ ] # Qux.') | 916 self.assert_round_trip('[ FOO ] bar [ BAZ ] # Qux.', '[ FO
O ] bar [ BAZ ] # Qux.') |
| OLD | NEW |