summaryrefslogtreecommitdiffstats
path: root/chrome/test/chromeos
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 17:46:44 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 17:46:44 +0000
commitfcde51c7606372fe136e90f65d05307fd74228eb (patch)
tree43c3083639a8b2a629b8a34ff4023126a1c38e2f /chrome/test/chromeos
parent0bb5ad3af6cc6d483a570b2eafce59ee9b86d244 (diff)
downloadchromium_src-fcde51c7606372fe136e90f65d05307fd74228eb.zip
chromium_src-fcde51c7606372fe136e90f65d05307fd74228eb.tar.gz
chromium_src-fcde51c7606372fe136e90f65d05307fd74228eb.tar.bz2
Fixed broken ChromeOS autotests due to http://codereview.chromium.org/5740004
TEST=none BUG=none Review URL: http://codereview.chromium.org/6289005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/chromeos')
-rw-r--r--chrome/test/chromeos/autotest/files/client/site_tests/desktopui_BrowserTest/desktopui_BrowserTest.py4
-rw-r--r--chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/desktopui_PyAutoFunctionalTests.py4
-rw-r--r--chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py4
-rw-r--r--chrome/test/chromeos/autotest/files/client/site_tests/desktopui_UITest/desktopui_UITest.py4
4 files changed, 8 insertions, 8 deletions
diff --git a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_BrowserTest/desktopui_BrowserTest.py b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_BrowserTest/desktopui_BrowserTest.py
index 38aafc7..ea328ae5 100644
--- a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_BrowserTest/desktopui_BrowserTest.py
+++ b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_BrowserTest/desktopui_BrowserTest.py
@@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from autotest_lib.client.bin import site_chrome_test
+from autotest_lib.client.cros import chrome_test
-class desktopui_BrowserTest(site_chrome_test.ChromeTestBase):
+class desktopui_BrowserTest(chrome_test.ChromeTestBase):
version = 1
binary_to_run='browser_tests'
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 4e36334..8c495e0 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
@@ -3,9 +3,9 @@
# found in the LICENSE file.
import os
-from autotest_lib.client.bin import site_chrome_test
+from autotest_lib.client.cros import chrome_test
-class desktopui_PyAutoFunctionalTests(site_chrome_test.ChromeTestBase):
+class desktopui_PyAutoFunctionalTests(chrome_test.ChromeTestBase):
"""Wrapper for running Chrome's PyAuto-based functional tests."""
version = 1
diff --git a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py
index d6344cdc..50b47ad 100644
--- a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py
+++ b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py
@@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from autotest_lib.client.bin import site_chrome_test
+from autotest_lib.client.cros import chrome_test
-class desktopui_SyncIntegrationTests(site_chrome_test.ChromeTestBase):
+class desktopui_SyncIntegrationTests(chrome_test.ChromeTestBase):
version = 1
def run_once(self):
diff --git a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_UITest/desktopui_UITest.py b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_UITest/desktopui_UITest.py
index 5d88fde..95874c1 100644
--- a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_UITest/desktopui_UITest.py
+++ b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_UITest/desktopui_UITest.py
@@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from autotest_lib.client.bin import site_chrome_test
+from autotest_lib.client.cros import chrome_test
-class desktopui_UITest(site_chrome_test.ChromeTestBase):
+class desktopui_UITest(chrome_test.ChromeTestBase):
version = 1
binary_to_run='ui_tests'