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

Side by Side Diff: tools/telemetry/telemetry/internal/browser/browser_options.py

Issue 1281923003: [Android] Add --blacklist-file as a command-line option. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 copy 5 import copy
6 import logging 6 import logging
7 import optparse 7 import optparse
8 import os 8 import os
9 import shlex 9 import shlex
10 import socket 10 import socket
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 self.cros_remote = None 44 self.cros_remote = None
45 45
46 self.profiler = None 46 self.profiler = None
47 self.verbosity = 0 47 self.verbosity = 0
48 48
49 self.browser_options = BrowserOptions() 49 self.browser_options = BrowserOptions()
50 self.output_file = None 50 self.output_file = None
51 51
52 self.android_rndis = False 52 self.android_rndis = False
53 self.no_performance_mode = False 53 self.no_performance_mode = False
nednguyen 2015/08/08 02:13:41 Do you need to add self.android_black_list_file =
jbudorick 2015/08/13 17:38:17 Added.
54 54
55 def __repr__(self): 55 def __repr__(self):
56 return str(sorted(self.__dict__.items())) 56 return str(sorted(self.__dict__.items()))
57 57
58 def Copy(self): 58 def Copy(self):
59 return copy.deepcopy(self) 59 return copy.deepcopy(self)
60 60
61 def CreateParser(self, *args, **kwargs): 61 def CreateParser(self, *args, **kwargs):
62 parser = optparse.OptionParser(*args, **kwargs) 62 parser = optparse.OptionParser(*args, **kwargs)
63 63
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 group.add_option('--no-performance-mode', action='store_true', 129 group.add_option('--no-performance-mode', action='store_true',
130 help='Some platforms run on "full performance mode" where the ' 130 help='Some platforms run on "full performance mode" where the '
131 'test is executed at maximum CPU speed in order to minimize noise ' 131 'test is executed at maximum CPU speed in order to minimize noise '
132 '(specially important for dashboards / continuous builds). ' 132 '(specially important for dashboards / continuous builds). '
133 'This option prevents Telemetry from tweaking such platform settings.') 133 'This option prevents Telemetry from tweaking such platform settings.')
134 group.add_option('--android-rndis', dest='android_rndis', default=False, 134 group.add_option('--android-rndis', dest='android_rndis', default=False,
135 action='store_true', help='Use RNDIS forwarding on Android.') 135 action='store_true', help='Use RNDIS forwarding on Android.')
136 group.add_option('--no-android-rndis', dest='android_rndis', 136 group.add_option('--no-android-rndis', dest='android_rndis',
137 action='store_false', help='Do not use RNDIS forwarding on Android.' 137 action='store_false', help='Do not use RNDIS forwarding on Android.'
138 ' [default]') 138 ' [default]')
139 group.add_option('--android-blacklist-file',
140 help='Device blacklist JSON file.')
139 parser.add_option_group(group) 141 parser.add_option_group(group)
140 142
141 # Browser options. 143 # Browser options.
142 self.browser_options.AddCommandLineArgs(parser) 144 self.browser_options.AddCommandLineArgs(parser)
143 145
144 real_parse = parser.parse_args 146 real_parse = parser.parse_args
145 def ParseArgs(args=None): 147 def ParseArgs(args=None):
146 defaults = parser.get_default_values() 148 defaults = parser.get_default_values()
147 for k, v in defaults.__dict__.items(): 149 for k, v in defaults.__dict__.items():
148 if k in self.__dict__ and self.__dict__[k] != None: 150 if k in self.__dict__ and self.__dict__[k] != None:
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 # Disable GAIA/enterprise services. 418 # Disable GAIA/enterprise services.
417 self.disable_gaia_services = True 419 self.disable_gaia_services = True
418 420
419 self.auto_login = True 421 self.auto_login = True
420 self.gaia_login = False 422 self.gaia_login = False
421 self.username = 'test@test.test' 423 self.username = 'test@test.test'
422 self.password = '' 424 self.password = ''
423 425
424 def IsCrosBrowserOptions(self): 426 def IsCrosBrowserOptions(self):
425 return True 427 return True
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698