diff options
| author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 21:09:39 +0000 |
|---|---|---|
| committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 21:09:39 +0000 |
| commit | cd0a257d3d22a772c29993329ef3810ca97227e7 (patch) | |
| tree | 4a92f7b0123dcc1a22ed4acf87e43bd452238719 /chrome/test/chromeos/autotest | |
| parent | 628bf46171db1a2ca1beca7b83d4e0e0aec69d47 (diff) | |
| download | chromium_src-cd0a257d3d22a772c29993329ef3810ca97227e7.zip chromium_src-cd0a257d3d22a772c29993329ef3810ca97227e7.tar.gz chromium_src-cd0a257d3d22a772c29993329ef3810ca97227e7.tar.bz2 | |
Add the option to run continuous test suite for desktopui_PyAutoFunctionalTests.
It is now possible to pass '-a cont_suite' to autoserv to run continuous instead
of full suite.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7346039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/chromeos/autotest')
2 files changed, 9 insertions, 5 deletions
diff --git a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/control b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/control index ac7ef4d..e1bd32a 100644 --- a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/control +++ b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/control @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -16,4 +16,8 @@ This is a wrapper test for Chrome pyauto-based functional tests. http://dev.chromium.org/developers/testing/pyauto """ -job.run_test('desktopui_PyAutoFunctionalTests') +if args: + job.run_test('desktopui_PyAutoFunctionalTests', suite=args[0]) +else: + job.run_test('desktopui_PyAutoFunctionalTests') + diff --git a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/desktopui_PyAutoFunctionalTests.py b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/desktopui_PyAutoFunctionalTests.py index 46acc63..cd196e4 100644 --- a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/desktopui_PyAutoFunctionalTests.py +++ b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/desktopui_PyAutoFunctionalTests.py @@ -59,7 +59,7 @@ class desktopui_PyAutoFunctionalTests(chrome_test.ChromeTestBase): open(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE, 'w').close() assert os.path.exists(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE) - def run_once(self): + def run_once(self, suite='FULL'): """Run pyauto functional tests.""" # Enable chrome testing interface and Login deps_dir = os.path.join(self.autodir, 'deps') @@ -71,8 +71,8 @@ class desktopui_PyAutoFunctionalTests(chrome_test.ChromeTestBase): os.path.join(pyautolib_dir, 'chromeos', 'chromeos_utils.py')) utils.system(login_cmd) - # Run pyauto tests "FULL" suite + # Run pyauto tests functional_cmd = cros_ui.xcommand_as( '%s/chrome_test/test_src/chrome/test/functional/' - 'pyauto_functional.py --suite=FULL -v' % deps_dir) + 'pyauto_functional.py --suite=%s -v' % (deps_dir, suite)) utils.system(functional_cmd) |