diff options
| author | dbasehore@chromium.org <dbasehore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 22:17:36 +0000 |
|---|---|---|
| committer | dbasehore@chromium.org <dbasehore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 22:17:36 +0000 |
| commit | a596c5f39dfd72fcdf5da6b2b9e24c5bff356bfe (patch) | |
| tree | 4ba34c4f431d821c12e49878986159c5fe3cd235 | |
| parent | e1d4e3de38303d5fbcfcf5a8fbc71dc2e6af6744 (diff) | |
| download | chromium_src-a596c5f39dfd72fcdf5da6b2b9e24c5bff356bfe.zip chromium_src-a596c5f39dfd72fcdf5da6b2b9e24c5bff356bfe.tar.gz chromium_src-a596c5f39dfd72fcdf5da6b2b9e24c5bff356bfe.tar.bz2 | |
Update pyauto to override IsBrowserTestSuite function
We need this to keep pyauto working until all of the tests have moved over to
telemetry.
BUG=348729
TEST=desktopui_PyAutoInstall and power_LoadTest
Review URL: https://codereview.chromium.org/196023014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257224 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/pyautolib/pyautolib.cc | 2 | ||||
| -rw-r--r-- | chrome/test/pyautolib/pyautolib.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/pyautolib/pyautolib.cc b/chrome/test/pyautolib/pyautolib.cc index aa50f92..52bf726 100644 --- a/chrome/test/pyautolib/pyautolib.cc +++ b/chrome/test/pyautolib/pyautolib.cc @@ -40,6 +40,8 @@ void PyUITestSuiteBase::SetCrSourceRoot(const base::FilePath& path) { PathService::Override(base::DIR_SOURCE_ROOT, path); } +bool PyUITestSuiteBase::IsBrowserTestSuite() { return true; } + // PyUITestBase PyUITestBase::PyUITestBase(bool clear_profile, std::wstring homepage) : UITestBase() { diff --git a/chrome/test/pyautolib/pyautolib.h b/chrome/test/pyautolib/pyautolib.h index f4bcb27..a27b8d2 100644 --- a/chrome/test/pyautolib/pyautolib.h +++ b/chrome/test/pyautolib/pyautolib.h @@ -38,6 +38,8 @@ class PyUITestSuiteBase : public UITestSuite { void SetCrSourceRoot(const base::FilePath& path); + virtual bool IsBrowserTestSuite() OVERRIDE; + private: #if defined(OS_MACOSX) base::mac::ScopedNSAutoreleasePool pool_; |