@@ -163,44 +163,92 @@ class CommandLineOptions: # pylint: disable=too-many-instance-attributes,missing
163
163
("useragent" , "general.useragent" , "agent" , "ua" ): "USERAGENT" ,
164
164
(
165
165
"details" ,
166
- "general.details" ,
167
- "detail" ,
168
- "extended" ,
166
+ "general.review.details" ,
169
167
"use_detailed_report" ): "USE_DETAILED_REPORT" ,
170
168
(
171
169
"improve-only" ,
172
- "general.improve-only" ,
170
+ "general.review. improve-only" ,
173
171
"review_show_improvements_only" ): "REVIEW_SHOW_IMPROVEMENTS_ONLY" ,
174
172
(
175
173
"timeout" ,
176
- "general.timeout" ,
177
- "http-timeout" ,
174
+ "general.request.timeout" ,
178
175
"http_request_timeout" ): "HTTP_REQUEST_TIMEOUT" ,
179
176
(
180
- "tests.lighthouse.apikey" ,
181
- "tests.google-apikey" ,
182
- "tests.googleapikey" ,
183
- "tests.googlepagespeedapikey" ,
177
+ "cache" ,
178
+ "general.cache.use" ,
179
+ "cache_when_possible" ): "CACHE_WHEN_POSSIBLE" ,
180
+ (
181
+ "cachetime" ,
182
+ "general.cache.time" ,
183
+ "cache_time_delta" ): "CACHE_TIME_DELTA" ,
184
+ (
185
+ "dnsserver" ,
186
+ "general.dns.address" ,
187
+ "dns_server" ): "DNS_SERVER" ,
188
+ (
189
+ "githubkey" ,
190
+ "github.api.key" ,
191
+ "github_api_key" ): "GITHUB_API_KEY" ,
192
+ (
193
+ "googleapikey" ,
194
+ "tests.lighthouse.api.key" ,
184
195
"googlepagespeedapikey" ): "GOOGLEPAGESPEEDAPIKEY" ,
185
196
(
186
- "tests.lighthouse.use" ,
187
- "tests.google-use-api" ,
188
- "tests.googleuseapi" ,
197
+ "googleuseapi" ,
198
+ "tests.lighthouse.api.use" ,
189
199
"lighthouse_use_api" ): "LIGHTHOUSE_USE_API" ,
190
- ("tests.webkoll.sleep" , "tests.webbkoll_sleep" ): "WEBBKOLL_SLEEP" ,
191
- ("tests.w3c.group" , "tests.css.group" ): "CSS_REVIEW_GROUP_ERRORS" ,
192
200
(
193
- "tests.ylt.apikey " ,
194
- "tests.yellowlabtools-apikey " ,
195
- "tests.yellowlabtoolsapikey " ): "YLT_USE_API " ,
201
+ "webbkollsleep " ,
202
+ "tests.webbkoll.sleep " ,
203
+ "webbkoll_sleep " ): "WEBBKOLL_SLEEP " ,
196
204
(
197
- "tests.ylt.address" ,
198
- "tests.yellowlabtools-address" ,
199
- "tests.yellowlabtoolsaddress" ,
205
+ "tests.w3c.group" ,
206
+ "tests.css.group" ,
207
+ "css_review_group_errors" ): "CSS_REVIEW_GROUP_ERRORS" ,
208
+ (
209
+ "yellowlabtoolskey" ,
210
+ "tests.ylt.api.key" ,
211
+ "ylt_use_api" ): "YLT_USE_API" ,
212
+ (
213
+ "yellowlabtoolsaddress" ,
214
+ "tests.ylt.api.address" ,
200
215
"ylt_server_address" ): "YLT_SERVER_ADDRESS" ,
201
- # ("http-timeout", "http_request_timeout"): "HTTP_REQUEST_TIMEOUT",
202
- # ("http-timeout", "http_request_timeout"): "HTTP_REQUEST_TIMEOUT",
203
- # ("http-timeout", "http_request_timeout"): "HTTP_REQUEST_TIMEOUT",
216
+ (
217
+ "sitespeeddocker" ,
218
+ "tests.sitespeed.docker.use" ,
219
+ "sitespeed_use_docker" ): "SITESPEED_USE_DOCKER" ,
220
+ (
221
+ "sitespeedtimeout" ,
222
+ "tests.sitespeed.timeout" ,
223
+ "sitespeed_timeout" ): "SITESPEED_TIMEOUT" ,
224
+ (
225
+ "sitespeediterations" ,
226
+ "tests.sitespeed.iterations" ,
227
+ "sitespeed_iterations" ): "SITESPEED_ITERATIONS" ,
228
+ (
229
+ "csponly" ,
230
+ "tests.http.csp-only" ,
231
+ "csp_only" ): "CSP_ONLY" ,
232
+ (
233
+ "stealth" ,
234
+ "tests.software.stealth.use" ,
235
+ "software_use_stealth" ): "SOFTWARE_USE_STEALTH" ,
236
+ (
237
+ "advisorydatabase" ,
238
+ "tests.software.advisory.path" ,
239
+ "software_github_adadvisory_database_path" ): "SOFTWARE_GITHUB_ADADVISORY_DATABASE_PATH" ,
240
+ (
241
+ "browser" ,
242
+ "tests.software.browser" ,
243
+ "software_browser" ): "SOFTWARE_BROWSER" ,
244
+ (
245
+ "mailport25" ,
246
+ "tests.email.support.port25" ,
247
+ "email_network_support_port25_traffic" ): "EMAIL_NETWORK_SUPPORT_PORT25_TRAFFIC" ,
248
+ (
249
+ "mailipv6" ,
250
+ "tests.email.support.ipv6" ,
251
+ "email_network_support_ipv6_traffic" ): "EMAIL_NETWORK_SUPPORT_IPV6_TRAFFIC"
204
252
}
205
253
206
254
def __init__ (self ):
@@ -297,9 +345,11 @@ def set_input_take(self, arg):
297
345
sys .exit (2 )
298
346
299
347
def show_available_settings (self ):
348
+ print ()
300
349
print ('Valid settings arguments:' )
301
350
for aliases in self .config_mapping :
302
- print (f"--setting { aliases [0 ]} =<value>" )
351
+ print (f"--setting { aliases [1 ]} =<value> ( alias: { aliases [0 ]} )" )
352
+ print ()
303
353
304
354
def set_setting (self , arg ):
305
355
pair = arg .split ('=' )
0 commit comments