diff options
| -rw-r--r-- | DEPS | 11 | ||||
| -rw-r--r-- | chrome/test/functional.DEPS/DEPS | 2 | ||||
| -rw-r--r-- | chrome/test/pyautolib/pyauto.py | 2 | ||||
| -rw-r--r-- | chrome/test/pyautolib/webdriver.DEPS/DEPS | 2 | ||||
| -rw-r--r-- | chrome/test/webdriver/test/run_webdriver_tests.py | 9 | ||||
| -rw-r--r-- | chrome/test/webdriver/test/test_paths.py | 2 |
6 files changed, 16 insertions, 12 deletions
@@ -224,14 +224,9 @@ deps = { "src/third_party/swig/Lib": "/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"), - # WebDriver keeps client and test code separate, and merges when the - # python egg is installed. We run tests directly from src, so import - # the code into the structure expected by the tests. - # Make sure you update chrome/test/functional.DEPS/DEPS too. - "src/third_party/webdriver/python/selenium": - "http://selenium.googlecode.com/svn/trunk/py/selenium@13487", - "src/third_party/webdriver/python/selenium/test": - "http://selenium.googlecode.com/svn/trunk/py/test@13487", + # Make sure you update the two functional.DEPS and webdriver.DEPS too. + "src/third_party/webdriver/pylib": + "http://selenium.googlecode.com/svn/trunk/py@13487", "src/third_party/libvpx": "/trunk/deps/third_party/libvpx@" + diff --git a/chrome/test/functional.DEPS/DEPS b/chrome/test/functional.DEPS/DEPS index b9bc7eb..994de82 100644 --- a/chrome/test/functional.DEPS/DEPS +++ b/chrome/test/functional.DEPS/DEPS @@ -9,7 +9,7 @@ deps = { 'src/third_party/simplejson': '/trunk/src/third_party/simplejson', 'src/third_party/tlslite': '/trunk/src/third_party/tlslite', 'src/third_party/psutil': '/trunk/src/third_party/psutil', - 'src/third_party/webdriver/python/selenium': + 'src/third_party/webdriver/pylib/selenium': 'http://selenium.googlecode.com/svn/trunk/py/selenium@13487', } diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py index a7df82e..a60e791 100644 --- a/chrome/test/pyautolib/pyauto.py +++ b/chrome/test/pyautolib/pyauto.py @@ -55,7 +55,7 @@ def _LocateBinDirs(): deps_dirs = [ os.path.dirname(__file__), pyauto_paths.GetThirdPartyDir(), - os.path.join(pyauto_paths.GetThirdPartyDir(), 'webdriver', 'python'), + os.path.join(pyauto_paths.GetThirdPartyDir(), 'webdriver', 'pylib'), ] sys.path += map(os.path.normpath, pyauto_paths.GetBuildDirs() + deps_dirs) diff --git a/chrome/test/pyautolib/webdriver.DEPS/DEPS b/chrome/test/pyautolib/webdriver.DEPS/DEPS index 8ab2ac8..73bca65 100644 --- a/chrome/test/pyautolib/webdriver.DEPS/DEPS +++ b/chrome/test/pyautolib/webdriver.DEPS/DEPS @@ -1,5 +1,5 @@ deps = { # This is only used by the buildbot master config for chrome official. - 'src/third_party/webdriver/python/selenium': + 'src/third_party/webdriver/pylib/selenium': 'http://selenium.googlecode.com/svn/trunk/py/selenium@13487', } diff --git a/chrome/test/webdriver/test/run_webdriver_tests.py b/chrome/test/webdriver/test/run_webdriver_tests.py index c23cdf1..02bcdbf 100644 --- a/chrome/test/webdriver/test/run_webdriver_tests.py +++ b/chrome/test/webdriver/test/run_webdriver_tests.py @@ -266,6 +266,15 @@ class Main(object): # TODO(kkania): Remove this hack. self._FakePytestHack() + # In the webdriver tree, the python 'test' module is moved under the root + # 'selenium' one for testing. Here we mimic that by setting the 'selenium' + # module's 'test' attribute and adding 'selenium.test' to the system + # modules. + import selenium + import test + selenium.test = test + sys.modules['selenium.test'] = test + test_names = self._GetTestNames(self._args) # The tests expect to run with preset 'driver' and 'webserver' class diff --git a/chrome/test/webdriver/test/test_paths.py b/chrome/test/webdriver/test/test_paths.py index ec766b0..059ed62 100644 --- a/chrome/test/webdriver/test/test_paths.py +++ b/chrome/test/webdriver/test/test_paths.py @@ -20,7 +20,7 @@ def _SetupPaths(): SRC_THIRD_PARTY = J(start_dir, os.pardir, os.pardir, os.pardir, os.pardir, 'third_party') webdriver = J(SRC_THIRD_PARTY, 'webdriver') - PYTHON_BINDINGS = J(webdriver, 'python') + PYTHON_BINDINGS = J(webdriver, 'pylib') WEBDRIVER_TEST_DATA = J(webdriver, 'test_data') global CHROMEDRIVER_EXE |