Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py

Issue 454223003: Remove the concept of 'integration tests' from test-webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: merge forward, remove dead / uneeded code Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (C) 2010 Google Inc. All rights reserved. 1 # Copyright (C) 2010 Google Inc. All rights reserved.
2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged
3 # Copyright (C) 2011 Apple Inc. All rights reserved. 3 # Copyright (C) 2011 Apple Inc. All rights reserved.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are 6 # modification, are permitted provided that the following conditions are
7 # met: 7 # met:
8 # 8 #
9 # * Redistributions of source code must retain the above copyright 9 # * Redistributions of source code must retain the above copyright
10 # notice, this list of conditions and the following disclaimer. 10 # notice, this list of conditions and the following disclaimer.
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 # Ensure the results were written out and displayed. 218 # Ensure the results were written out and displayed.
219 failing_results_text = host.filesystem.read_text_file('/tmp/layout-test- results/failing_results.json') 219 failing_results_text = host.filesystem.read_text_file('/tmp/layout-test- results/failing_results.json')
220 json_to_eval = failing_results_text.replace("ADD_RESULTS(", "").replace( ");", "") 220 json_to_eval = failing_results_text.replace("ADD_RESULTS(", "").replace( ");", "")
221 self.assertEqual(json.loads(json_to_eval), details.summarized_failing_re sults) 221 self.assertEqual(json.loads(json_to_eval), details.summarized_failing_re sults)
222 222
223 full_results_text = host.filesystem.read_text_file('/tmp/layout-test-res ults/full_results.json') 223 full_results_text = host.filesystem.read_text_file('/tmp/layout-test-res ults/full_results.json')
224 self.assertEqual(json.loads(full_results_text), details.summarized_full_ results) 224 self.assertEqual(json.loads(full_results_text), details.summarized_full_ results)
225 225
226 self.assertEqual(host.user.opened_urls, [path.abspath_to_uri(MockHost(). platform, '/tmp/layout-test-results/results.html')]) 226 self.assertEqual(host.user.opened_urls, [path.abspath_to_uri(MockHost(). platform, '/tmp/layout-test-results/results.html')])
227 227
228
229 def test_batch_size(self): 228 def test_batch_size(self):
230 batch_tests_run = get_test_batches(['--batch-size', '2']) 229 batch_tests_run = get_test_batches(['--batch-size', '2'])
231 for batch in batch_tests_run: 230 for batch in batch_tests_run:
232 self.assertTrue(len(batch) <= 2, '%s had too many tests' % ', '.join (batch)) 231 self.assertTrue(len(batch) <= 2, '%s had too many tests' % ', '.join (batch))
233 232
234 def test_max_locked_shards(self): 233 def test_max_locked_shards(self):
235 # Tests for the default of using one locked shard even in the case of mo re than one child process. 234 # Tests for the default of using one locked shard even in the case of mo re than one child process.
236 if not self.should_test_processes: 235 if not self.should_test_processes:
237 return 236 return
238 save_env_webkit_test_max_locked_shards = None 237 save_env_webkit_test_max_locked_shards = None
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 stderr = StringIO.StringIO() 1052 stderr = StringIO.StringIO()
1054 res = run_webkit_tests.main(['--platform', 'test', '--exit-after-n-failu res', '1', 1053 res = run_webkit_tests.main(['--platform', 'test', '--exit-after-n-failu res', '1',
1055 'failures/unexpected/missing_text.html', 1054 'failures/unexpected/missing_text.html',
1056 'failures/unexpected/missing_image.html'], 1055 'failures/unexpected/missing_image.html'],
1057 stdout, stderr) 1056 stdout, stderr)
1058 self.assertEqual(res, test_run_results.EARLY_EXIT_STATUS) 1057 self.assertEqual(res, test_run_results.EARLY_EXIT_STATUS)
1059 self.assertEqual(stdout.getvalue(), 1058 self.assertEqual(stdout.getvalue(),
1060 ('\n' 1059 ('\n'
1061 'Regressions: Unexpected missing results (1)\n' 1060 'Regressions: Unexpected missing results (1)\n'
1062 ' failures/unexpected/missing_image.html [ Missing ]\n\n')) 1061 ' failures/unexpected/missing_image.html [ Missing ]\n\n'))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698