| Index: chrome/test/pyautolib/pyauto.py
|
| diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
|
| index 53d86ca6deccec640e6509ae856df418e1016e8d..9ff0ede42ea660068bc010a456bca7cc3bde1028 100755
|
| --- a/chrome/test/pyautolib/pyauto.py
|
| +++ b/chrome/test/pyautolib/pyauto.py
|
| @@ -5431,6 +5431,24 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
|
|
|
| return result
|
|
|
| + def RunAshCommand(self, action):
|
| + """Applies accelerator to ASH.
|
| +
|
| + Apply the accelerator with given id to ASH (ChromeOS only). Action list can
|
| + be found in ash/accelerators/accelerator_table.h, AcceleratorAction enum.
|
| +
|
| + Args:
|
| + action: accelerator code (eg. pyauto.TAKE_SCREENSHOT).
|
| +
|
| + Returns:
|
| + A boolean indicating whether the accelerator was handled.
|
| + """
|
| + cmd_dict = {
|
| + 'command': 'RunAshCommand',
|
| + 'action': action
|
| + }
|
| + return self._GetResultFromJSONRequest(cmd_dict, windex=None)
|
| +
|
| ## ChromeOS section -- end
|
|
|
|
|
| @@ -5886,15 +5904,15 @@ class Main(object):
|
| args: [module1, module2, module3.testcase, module4.testcase.testX]
|
| These modules or test cases or tests should be importable
|
|
|
| - Returns:
|
| - a list of expanded test names. Example:
|
| - [
|
| - 'module1.TestCase1.testA',
|
| - 'module1.TestCase1.testB',
|
| - 'module2.TestCase2.testX',
|
| - 'module3.testcase.testY',
|
| - 'module4.testcase.testX'
|
| - ]
|
| + Returns:
|
| + a list of expanded test names. Example:
|
| + [
|
| + 'module1.TestCase1.testA',
|
| + 'module1.TestCase1.testB',
|
| + 'module2.TestCase2.testX',
|
| + 'module3.testcase.testY',
|
| + 'module4.testcase.testX'
|
| + ]
|
| """
|
| if not args: # Load tests ourselves
|
| if self._HasTestCases('__main__'): # we are running a test script
|
|
|