summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjqian@google.com <jqian@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-20 21:41:54 +0000
committerjqian@google.com <jqian@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-20 21:41:54 +0000
commitc51a2e54f5a72553e7b4e27795342dd15596e058 (patch)
tree5e36131f7c32e1959c9c4f014a88282040b0ef78 /chrome
parent40dc3b2ba0937cd6709072139228edc6e7940f4d (diff)
downloadchromium_src-c51a2e54f5a72553e7b4e27795342dd15596e058.zip
chromium_src-c51a2e54f5a72553e7b4e27795342dd15596e058.tar.gz
chromium_src-c51a2e54f5a72553e7b4e27795342dd15596e058.tar.bz2
Fix the test failure due to gtalk extension name change. Also need to
check in latest talk.crx(1.2012.222.2.crx) Bug: http://code.google.com/p/chromium/issues/detail?id=115534 Test: Running the test locally. Review URL: http://codereview.chromium.org/9726018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/functional/gtalk/gtalk_base_test.py2
-rw-r--r--chrome/test/functional/gtalk/test_basic.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/test/functional/gtalk/gtalk_base_test.py b/chrome/test/functional/gtalk/gtalk_base_test.py
index 76a5a1a..3a86490 100644
--- a/chrome/test/functional/gtalk/gtalk_base_test.py
+++ b/chrome/test/functional/gtalk/gtalk_base_test.py
@@ -57,7 +57,7 @@ class GTalkBaseTest(pyauto.PyUITest):
def GetGTalkExtensionInfo(self):
"""Get the data object about the GTalk extension."""
extensions = [x for x in self.GetExtensionsInfo()
- if x['name'] == 'Google Talk']
+ if x['name'] == 'Chat for Google']
return extensions[0] if len(extensions) == 1 else None
def RunInMole(self, js, mole_index=0):
diff --git a/chrome/test/functional/gtalk/test_basic.py b/chrome/test/functional/gtalk/test_basic.py
index 1895361..fe03a29 100644
--- a/chrome/test/functional/gtalk/test_basic.py
+++ b/chrome/test/functional/gtalk/test_basic.py
@@ -136,6 +136,9 @@ class BasicTest(gtalk_base_test.GTalkBaseTest):
# Click "chatpinger@appspot.com" to open a chat mole.
self.RunInRoster('$Click($FindByText($BODY(), "chatpinger@appspot.com"))')
+ # Wait until ready to check whether mole is open(temporary work around).
+ time.sleep(1)
+
# Wait for chat mole to open.
self.assertTrue(self.WaitUntil(self.GetMoleInfo),
msg='Timed out waiting for mole window to open.')