Chromium Code Reviews| Index: chrome/test/pyautolib/pyautolib.i |
| =================================================================== |
| --- chrome/test/pyautolib/pyautolib.i (revision 79305) |
| +++ chrome/test/pyautolib/pyautolib.i (working copy) |
| @@ -194,14 +194,9 @@ |
| action_max_timeout_ms; |
| int action_max_timeout_ms() const; |
| - %feature("docstring", "Get the timeout (in milli secs) for an automation " |
|
Nirnimesh
2011/03/29 20:27:28
Please retain these. Just replace command_executio
Huyen
2011/03/31 02:42:55
Done. This corresponds to AutomationProx::action_t
|
| - "call") command_execution_timeout_ms; |
| - int command_execution_timeout_ms() const; |
| - %feature("docstring", "Set the timeout (in milli secs) for an automation " |
| - "call. This is an internal method. Do not use this directly. " |
| - "Use CmdExecutionTimeoutChanger instead") |
| - set_command_execution_timeout_ms; |
| - void set_command_execution_timeout_ms(int timeout); |
| + %feature("docstring", "Timeout (in milli secs) for large tests.") |
| + large_test_timeout_ms; |
| + int large_test_timeout_ms() const; |
| %feature("docstring", "Launches the browser and IPC testing server.") |
| LaunchBrowserAndServer; |
| @@ -374,6 +369,15 @@ |
| _SendJSONRequest; |
| std::string _SendJSONRequest(int window_index, const std::string& request); |
| + // Meta-method |
| + %feature("docstring", "Send a sync JSON request to Chrome. " |
| + "Returns a JSON dict as a response. " |
|
Nirnimesh
2011/03/29 20:27:28
Add some description about the timeout in the docs
Huyen
2011/03/31 02:42:55
Done.
|
| + "Internal method.") |
| + _SendJSONRequest; |
| + std::string _SendJSONRequest(int window_index, |
| + const std::string& request, |
| + int timeout); |
| + |
| %feature("docstring", "Execute a string of javascript in the specified " |
| "(window, tab, frame) and return a string.") ExecuteJavascript; |
| std::wstring ExecuteJavascript(const std::wstring& script, |