summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisgao@chromium.org <chrisgao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-21 18:26:42 +0000
committerchrisgao@chromium.org <chrisgao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-21 18:26:42 +0000
commit5aca9411d9866ada18b73d90d955bdd809babd6e (patch)
treeadeb8368920cbb26c08e18783c4af79616476bb7
parent4f2d5b1afa32dd6431c28f343954644872f23485 (diff)
downloadchromium_src-5aca9411d9866ada18b73d90d955bdd809babd6e.zip
chromium_src-5aca9411d9866ada18b73d90d955bdd809babd6e.tar.gz
chromium_src-5aca9411d9866ada18b73d90d955bdd809babd6e.tar.bz2
[chromedriver] Fix testSwitchWithoutArgument in py test.
Python in bots is 2.6, while it is 2.7 in Gobuntu desktop. The command line switch kEnableBenchmarking needs to be specified along with the kEnableStatsTable switch, as required in chrome_content_browser_client.cc(line 1173). NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12320042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183835 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xchrome/test/chromedriver/run_py_tests.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/test/chromedriver/run_py_tests.py b/chrome/test/chromedriver/run_py_tests.py
index 08e767b..c70fc38 100755
--- a/chrome/test/chromedriver/run_py_tests.py
+++ b/chrome/test/chromedriver/run_py_tests.py
@@ -341,9 +341,10 @@ class ChromeSwitchesCapabilitiesTest(unittest.TestCase):
"""
driver = chromedriver.ChromeDriver(_CHROMEDRIVER_LIB,
chrome_binary=_CHROME_BINARY,
- chrome_switches=['enable-benchmarking'])
+ chrome_switches=['enable-benchmarking',
+ 'enable-stats-table'])
result = driver.ExecuteScript('return chrome.benchmarking')
- self.assertIsNotNone(result)
+ self.assertNotEqual(None, result)
if __name__ == '__main__':