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

Side by Side Diff: mojo/devtools/common/devtoolslib/android_shell.py

Issue 1433353007: Drop default port number in `http_server.py` and `shell.py`. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « no previous file | mojo/devtools/common/devtoolslib/http_server.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 atexit 5 import atexit
6 import hashlib 6 import hashlib
7 import logging 7 import logging
8 import os 8 import os
9 import os.path 9 import os.path
10 import random 10 import random
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 host_port = self._forward_host_port_to_device(0, device_port) 414 host_port = self._forward_host_port_to_device(0, device_port)
415 print ("Dart observatory available at the host at http://127.0.0.1:%d" 415 print ("Dart observatory available at the host at http://127.0.0.1:%d"
416 % host_port) 416 % host_port)
417 417
418 logcat_watch_thread = threading.Thread( 418 logcat_watch_thread = threading.Thread(
419 target=_forward_observatories_as_needed) 419 target=_forward_observatories_as_needed)
420 logcat_watch_thread.daemon = True 420 logcat_watch_thread.daemon = True
421 logcat_watch_thread.start() 421 logcat_watch_thread.start()
422 422
423 @overrides(Shell) 423 @overrides(Shell)
424 def serve_local_directories(self, mappings, port=0, reuse_servers=False): 424 def serve_local_directories(self, mappings, port, reuse_servers=False):
425 assert mappings 425 assert mappings
426 if reuse_servers: 426 if reuse_servers:
427 assert port, 'Cannot reuse the server when |port| is 0.' 427 assert port, 'Cannot reuse the server when |port| is 0.'
428 server_address = ('127.0.0.1', port) 428 server_address = ('127.0.0.1', port)
429 else: 429 else:
430 server_address = http_server.start_http_server(mappings, port) 430 server_address = http_server.start_http_server(mappings, port)
431 431
432 return 'http://127.0.0.1:%d/' % self._forward_device_port_to_host( 432 return 'http://127.0.0.1:%d/' % self._forward_device_port_to_host(
433 port, server_address[1]) 433 port, server_address[1])
434 434
(...skipping 29 matching lines...) Expand all
464 Results.output = rf.read() 464 Results.output = rf.read()
465 465
466 run_thread = threading.Thread(target=do_run) 466 run_thread = threading.Thread(target=do_run)
467 run_thread.start() 467 run_thread.start()
468 run_thread.join(timeout) 468 run_thread.join(timeout)
469 469
470 if run_thread.is_alive(): 470 if run_thread.is_alive():
471 self.stop_shell() 471 self.stop_shell()
472 return None, Results.output, True 472 return None, Results.output, True
473 return None, Results.output, False 473 return None, Results.output, False
OLDNEW
« no previous file with comments | « no previous file | mojo/devtools/common/devtoolslib/http_server.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698