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

Side by Side Diff: build/android/pylib/instrumentation/instrumentation_test_instance.py

Issue 2633733002: Convert WebView Layout test to JUnit4 (Closed)
Patch Set: Rebase Created 3 years, 10 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
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import collections 5 import collections
6 import copy 6 import copy
7 import logging 7 import logging
8 import os 8 import os
9 import pickle 9 import pickle
10 import re 10 import re
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 self._data_deps_delegate = data_deps_delegate 600 self._data_deps_delegate = data_deps_delegate
601 self._runtime_deps_path = args.runtime_deps_path 601 self._runtime_deps_path = args.runtime_deps_path
602 602
603 if not self._runtime_deps_path: 603 if not self._runtime_deps_path:
604 logging.warning('No data dependencies will be pushed.') 604 logging.warning('No data dependencies will be pushed.')
605 605
606 def _initializeTestFilterAttributes(self, args): 606 def _initializeTestFilterAttributes(self, args):
607 if args.test_filter: 607 if args.test_filter:
608 self._test_filter = _CMDLINE_NAME_SEGMENT_RE.sub( 608 self._test_filter = _CMDLINE_NAME_SEGMENT_RE.sub(
609 '', args.test_filter.replace('#', '.')) 609 '', args.test_filter.replace('#', '.'))
610
611 def annotation_element(a): 610 def annotation_element(a):
612 a = a.split('=', 1) 611 a = a.split('=', 1)
613 return (a[0], a[1] if len(a) == 2 else None) 612 return (a[0], a[1] if len(a) == 2 else None)
614 613
615 if args.annotation_str: 614 if args.annotation_str:
616 self._annotations = [ 615 self._annotations = [
617 annotation_element(a) for a in args.annotation_str.split(',')] 616 annotation_element(a) for a in args.annotation_str.split(',')]
618 elif not self._test_filter: 617 elif not self._test_filter:
619 self._annotations = [ 618 self._annotations = [
620 annotation_element(a) for a in _DEFAULT_ANNOTATIONS] 619 annotation_element(a) for a in _DEFAULT_ANNOTATIONS]
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 838
840 @staticmethod 839 @staticmethod
841 def GenerateTestResults( 840 def GenerateTestResults(
842 result_code, result_bundle, statuses, start_ms, duration_ms): 841 result_code, result_bundle, statuses, start_ms, duration_ms):
843 return GenerateTestResults(result_code, result_bundle, statuses, 842 return GenerateTestResults(result_code, result_bundle, statuses,
844 start_ms, duration_ms) 843 start_ms, duration_ms)
845 844
846 #override 845 #override
847 def TearDown(self): 846 def TearDown(self):
848 pass 847 pass
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698