Changeset 159998 in webkit
- Timestamp:
- Dec 3, 2013 4:40:31 AM (10 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r159997 r159998 1 2013-12-03 Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu> 2 3 Remove get_test() and reference test names directly instead. 4 https://bugs.webkit.org/show_bug.cgi?id=124962 5 6 Reviewed by Csaba Osztrogonác. 7 8 * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: 9 (Base.__init__): 10 (Base.get_basic_tests): 11 (assert_exp): 12 (MiscTests.test_multiple_results): 13 (MiscTests.test_category_expectations): 14 (MiscTests.test_get_modifiers): 15 (MiscTests.test_get_expectations_string): 16 (MiscTests.test_get_test_set): 17 (MiscTests.test_parse_warning): 18 (MiscTests.test_pixel_tests_flag.match): 19 1 20 2013-12-03 Gergo Balogh <geryxyz@inf.u-szeged.hu> 2 21 -
trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py
r156895 r159998 54 54 unittest.TestCase.__init__(self, testFunc) 55 55 56 def get_test(self, test_name):57 # FIXME: Remove this routine and just reference test names directly.58 return test_name59 60 56 def get_basic_tests(self): 61 return [ self.get_test('failures/expected/text.html'),62 self.get_test('failures/expected/image_checksum.html'),63 self.get_test('failures/expected/crash.html'),64 self.get_test('failures/expected/missing_text.html'),65 self.get_test('failures/expected/image.html'),66 self.get_test('passes/text.html')]57 return ['failures/expected/text.html', 58 'failures/expected/image_checksum.html', 59 'failures/expected/crash.html', 60 'failures/expected/missing_text.html', 61 'failures/expected/image.html', 62 'passes/text.html'] 67 63 68 64 def get_basic_expectations(self): … … 85 81 86 82 def assert_exp(self, test, result): 87 self.assertEqual(self._exp.get_expectations( self.get_test(test)),83 self.assertEqual(self._exp.get_expectations(test), 88 84 set([result])) 89 85 … … 105 101 self.parse_exp('Bug(x) failures/expected/text.html [ Crash Failure ]') 106 102 self.assertEqual(self._exp.get_expectations( 107 self.get_test('failures/expected/text.html')),103 'failures/expected/text.html'), 108 104 set([FAIL, CRASH])) 109 105 … … 141 137 self.parse_exp(exp_str) 142 138 test_name = 'failures/expected/unknown-test.html' 143 unknown_test = self.get_test(test_name)139 unknown_test = test_name 144 140 self.assertRaises(KeyError, self._exp.get_expectations, 145 141 unknown_test) … … 148 144 def test_get_modifiers(self): 149 145 self.parse_exp(self.get_basic_expectations()) 150 self.assertEqual(self._exp.get_modifiers( 151 self.get_test('passes/text.html')), []) 146 self.assertEqual(self._exp.get_modifiers('passes/text.html'), []) 152 147 153 148 def test_get_expectations_string(self): 154 149 self.parse_exp(self.get_basic_expectations()) 155 self.assertEqual(self._exp.get_expectations_string( 156 self.get_test('failures/expected/text.html')), 157 'FAIL') 150 self.assertEqual(self._exp.get_expectations_string('failures/expected/text.html'), 'FAIL') 158 151 159 152 def test_expectation_to_string(self): … … 168 161 s = self._exp.get_test_set(WONTFIX) 169 162 self.assertEqual(s, 170 set([ self.get_test('failures/expected/crash.html'),171 self.get_test('failures/expected/image_checksum.html')]))163 set(['failures/expected/crash.html', 164 'failures/expected/image_checksum.html'])) 172 165 173 166 def test_parse_warning(self): … … 175 168 filesystem = self._port.host.filesystem 176 169 filesystem.write_text_file(filesystem.join(self._port.layout_tests_dir(), 'disabled-test.html-disabled'), 'content') 177 self.get_test('disabled-test.html-disabled'),178 170 self.parse_exp("[ FOO ] failures/expected/text.html [ Failure ]\n" 179 171 "Bug(rniwa) non-existent-test.html [ Failure ]\n" … … 225 217 def match(test, result, pixel_tests_enabled): 226 218 return self._exp.matches_an_expected_result( 227 self.get_test(test), result, pixel_tests_enabled)219 test, result, pixel_tests_enabled) 228 220 229 221 self.parse_exp(self.get_basic_expectations())
Note: See TracChangeset
for help on using the changeset viewer.