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

Unified Diff: mojo/devtools/common/devtoolslib/android_shell.py

Issue 1259773004: Add docstring inheritance decorator and drop duplicated docstrings. (Closed) Base URL: git@github.com:domokit/mojo.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | mojo/devtools/common/devtoolslib/linux_shell.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/devtools/common/devtoolslib/android_shell.py
diff --git a/mojo/devtools/common/devtoolslib/android_shell.py b/mojo/devtools/common/devtoolslib/android_shell.py
index 2d87f4efb97886eb2bb8f09a9391e351e25d2973..a00ede91ddb53b0d158e760bf7330af225c85943 100644
--- a/mojo/devtools/common/devtoolslib/android_shell.py
+++ b/mojo/devtools/common/devtoolslib/android_shell.py
@@ -18,6 +18,7 @@ import time
from devtoolslib.http_server import start_http_server
from devtoolslib.shell import Shell
+from devtoolslib.utils import overrides
# Tags used by mojo shell Java logging.
@@ -370,20 +371,8 @@ class AndroidShell(Shell):
logcat_watch_thread = threading.Thread(target=_ForwardObservatoriesAsNeeded)
logcat_watch_thread.start()
+ @overrides(Shell)
def ServeLocalDirectory(self, local_dir_path, port=0):
- """Serves the content of the local (host) directory, making it available to
- the shell under the url returned by the function.
-
- The server will run on a separate thread until the program terminates. The
- call returns immediately.
-
- Args:
- local_dir_path: path to the directory to be served
- port: port at which the server will be available to the shell
-
- Returns:
- The url that the shell can use to access the content of |local_dir_path|.
- """
assert local_dir_path
mappings = [('', local_dir_path)]
server_address = start_http_server(mappings, host_port=port)
@@ -391,45 +380,20 @@ class AndroidShell(Shell):
return 'http://127.0.0.1:%d/' % self._ForwardDevicePortToHost(
port, server_address[1])
+ @overrides(Shell)
def ServeLocalDirectories(self, mappings, port=0):
- """Serves the content of the local (host) directories, making it available
- to the shell under the url returned by the function.
-
- The server will run on a separate thread until the program terminates. The
- call returns immediately.
-
- Args:
- mappings: List of tuples (prefix, local_base_path) mapping URLs that start
- with |prefix| to local directory at |local_base_path|. The prefixes
- should skip the leading slash. The first matching prefix will be used
- each time.
- port: port at which the server will be available to the shell
-
- Returns:
- The url that the shell can use to access the content of |local_dir_path|.
- """
assert mappings
server_address = start_http_server(mappings, host_port=port)
return 'http://127.0.0.1:%d/' % self._ForwardDevicePortToHost(
port, server_address[1])
+ @overrides(Shell)
def ForwardHostPortToShell(self, host_port):
- """Forwards a port on the host machine to the same port wherever the shell
- is running.
-
- This is a no-op if the shell is running locally.
- """
self._ForwardHostPortToDevice(host_port, host_port)
+ @overrides(Shell)
def Run(self, arguments):
- """Runs the shell with given arguments until shell exits, passing the stdout
- mingled with stderr produced by the shell onto the stdout.
-
- Returns:
- Exit code retured by the shell or None if the exit code cannot be
- retrieved.
- """
self.CleanLogs()
self.ForwardObservatoryPorts()
@@ -440,22 +404,8 @@ class AndroidShell(Shell):
p.wait()
return None
+ @overrides(Shell)
def RunAndGetOutput(self, arguments, timeout=None):
- """Runs the shell with given arguments until shell exits and returns the
- output.
-
- Args:
- arguments: list of arguments for the shell
- timeout: maximum running time in seconds, after which the shell will be
- terminated
-
- Returns:
- A tuple of (return_code, output, did_time_out). |return_code| is the exit
- code returned by the shell or None if the exit code cannot be retrieved.
- |output| is the stdout mingled with the stderr produced by the shell.
- |did_time_out| is True iff the shell was terminated because it exceeded
- the |timeout| and False otherwise.
- """
class Results:
"""Workaround for Python scoping rules that prevent assigning to variables
from the outer scope.
« no previous file with comments | « no previous file | mojo/devtools/common/devtoolslib/linux_shell.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698