summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 21:57:52 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 21:57:52 +0000
commit1bdffff7418eec3f0cac4385078484628a9ed35e (patch)
treedec5fe731510e24e77b006e6dd6a0a36650ed0e2 /chrome/tools
parent973c0eda70048d5d9c6e7a02c14fb25e48a3d218 (diff)
downloadchromium_src-1bdffff7418eec3f0cac4385078484628a9ed35e.zip
chromium_src-1bdffff7418eec3f0cac4385078484628a9ed35e.tar.gz
chromium_src-1bdffff7418eec3f0cac4385078484628a9ed35e.tar.bz2
First part of automated_ui_tests improvements.
- disable unreliable RestoreTab action - make more command sync, waiting for their completion TEST=none BUG=21547, 21636 Review URL: http://codereview.chromium.org/196096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rwxr-xr-xchrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py5
-rw-r--r--chrome/tools/automated_ui_test_tools/possible_actions.txt4
2 files changed, 7 insertions, 2 deletions
diff --git a/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py b/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py
index df9bc22..4c335e6 100755
--- a/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py
+++ b/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py
@@ -245,7 +245,10 @@ class AutomatedTestInputGenerator:
def __init__(self):
(options,args) = ParseCommandLine()
input_file = open(options.input_file_name)
- actions_list = input_file.readlines()
+ actions_list = []
+ for line in input_file.readlines():
+ if not line.startswith('#'):
+ actions_list.append(line)
input_file.close()
self.__commands_per_file = options.commands_per_file
diff --git a/chrome/tools/automated_ui_test_tools/possible_actions.txt b/chrome/tools/automated_ui_test_tools/possible_actions.txt
index 9e5ad61..c69406f9 100644
--- a/chrome/tools/automated_ui_test_tools/possible_actions.txt
+++ b/chrome/tools/automated_ui_test_tools/possible_actions.txt
@@ -1,3 +1,4 @@
+# Please keep the list sorted.
Back
ChangeEncoding
CloseTab
@@ -16,7 +17,8 @@ DragTabRight
DragTabOut
OpenWindow
Reload
-RestoreTab
+# Disabled, it doesn't work reliably (http://crbug.com/21636).
+# RestoreTab
SelectNextTab
SelectPrevTab
ShowBookmarks