##// END OF EJS Templates
perf: make perf.run-limits code work with Python 3...
Gregory Szorc -
r42230:912d82da default
parent child Browse files
Show More
@@ -316,22 +316,22 b' def gettimer(ui, opts=None):'
316 limitspec = ui.configlist(b"perf", b"run-limits", [])
316 limitspec = ui.configlist(b"perf", b"run-limits", [])
317 limits = []
317 limits = []
318 for item in limitspec:
318 for item in limitspec:
319 parts = item.split('-', 1)
319 parts = item.split(b'-', 1)
320 if len(parts) < 2:
320 if len(parts) < 2:
321 ui.warn(('malformatted run limit entry, missing "-": %s\n'
321 ui.warn((b'malformatted run limit entry, missing "-": %s\n'
322 % item))
322 % item))
323 continue
323 continue
324 try:
324 try:
325 time_limit = float(parts[0])
325 time_limit = float(pycompat.sysstr(parts[0]))
326 except ValueError as e:
326 except ValueError as e:
327 ui.warn(('malformatted run limit entry, %s: %s\n'
327 ui.warn((b'malformatted run limit entry, %s: %s\n'
328 % (e, item)))
328 % (pycompat.bytestr(e), item)))
329 continue
329 continue
330 try:
330 try:
331 run_limit = int(parts[1])
331 run_limit = int(pycompat.sysstr(parts[1]))
332 except ValueError as e:
332 except ValueError as e:
333 ui.warn(('malformatted run limit entry, %s: %s\n'
333 ui.warn((b'malformatted run limit entry, %s: %s\n'
334 % (e, item)))
334 % (pycompat.bytestr(e), item)))
335 continue
335 continue
336 limits.append((time_limit, run_limit))
336 limits.append((time_limit, run_limit))
337 if not limits:
337 if not limits:
@@ -260,7 +260,8 b' error case are ignored'
260 malformatted run limit entry, missing "-": 500
260 malformatted run limit entry, missing "-": 500
261 ! wall * comb * user * sys * (best of 5) (glob)
261 ! wall * comb * user * sys * (best of 5) (glob)
262 $ hg perfparents --config perf.stub=no --config perf.run-limits='aaa-12, 0.000000001-5'
262 $ hg perfparents --config perf.stub=no --config perf.run-limits='aaa-12, 0.000000001-5'
263 malformatted run limit entry, could not convert string to float: aaa: aaa-12
263 malformatted run limit entry, could not convert string to float: aaa: aaa-12 (no-py3 !)
264 malformatted run limit entry, could not convert string to float: 'aaa': aaa-12 (py3 !)
264 ! wall * comb * user * sys * (best of 5) (glob)
265 ! wall * comb * user * sys * (best of 5) (glob)
265 $ hg perfparents --config perf.stub=no --config perf.run-limits='12-aaaaaa, 0.000000001-5'
266 $ hg perfparents --config perf.stub=no --config perf.run-limits='12-aaaaaa, 0.000000001-5'
266 malformatted run limit entry, invalid literal for int() with base 10: 'aaaaaa': 12-aaaaaa
267 malformatted run limit entry, invalid literal for int() with base 10: 'aaaaaa': 12-aaaaaa
General Comments 0
You need to be logged in to leave comments. Login now