diff options
| author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 23:24:50 +0000 |
|---|---|---|
| committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 23:24:50 +0000 |
| commit | d0c23038e59e9d9336cc81080f574e79eb8984d3 (patch) | |
| tree | 484dc5af7e90370dd964fc19824281529c40cc6d /o3d/tests | |
| parent | 20d241c33c3e6c1be8ab4023dfa46d6a4fdb4766 (diff) | |
| download | chromium_src-d0c23038e59e9d9336cc81080f574e79eb8984d3.zip chromium_src-d0c23038e59e9d9336cc81080f574e79eb8984d3.tar.gz chromium_src-d0c23038e59e9d9336cc81080f574e79eb8984d3.tar.bz2 | |
upgrade to selenium 1.03 and the newest chrome.
Review URL: http://codereview.chromium.org/1515007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests')
| -rw-r--r-- | o3d/tests/selenium/main.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/o3d/tests/selenium/main.py b/o3d/tests/selenium/main.py index 392e217..7cb4d1c 100644 --- a/o3d/tests/selenium/main.py +++ b/o3d/tests/selenium/main.py @@ -282,7 +282,7 @@ class SeleniumRemoteControl(threading.Thread): "-port", str(self.selenium_port), "-timeout", self.timeout], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - for unused_i in range(1, 10): + for unused_i in range(1, 20): server_msg = self.process.stdout.readline() if self.verbose and server_msg is not None: # log if verbose flag is on @@ -361,12 +361,7 @@ class SeleniumSessionBuilder: self.browserpath = browserpath def NewSeleniumSession(self, browser): - if browser == "*googlechrome": - # TODO: Replace socket.gethostname() with "localhost" - # once Chrome local proxy fix is in. - server_url = "http://" + socket.gethostname() + ":" - else: - server_url = "http://localhost:" + server_url = "http://localhost:" server_url += str(self.http_port) browser_path_with_space = "" @@ -619,8 +614,7 @@ def GetChromePath(): except WindowsError: value = None if '*googlechrome' in FLAGS.browser: - raise Exception("Unable to determine location for Chrome -- " + - "is it installed?") + print "Unable to determine location for Chrome -- is it installed?" return value |