summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 02:46:03 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 02:46:03 +0000
commit49c09c15d6bef3d14a7c77e9e59d90057cc3517d (patch)
tree3f00a08c635845489003c10c91729531b6ff973a /ppapi
parent4c1b035dd362ef394df78a5abdb46c6242d22fc4 (diff)
downloadchromium_src-49c09c15d6bef3d14a7c77e9e59d90057cc3517d.zip
chromium_src-49c09c15d6bef3d14a7c77e9e59d90057cc3517d.tar.gz
chromium_src-49c09c15d6bef3d14a7c77e9e59d90057cc3517d.tar.bz2
Add a separate cookie for the start of a PPAPI test to help reduce test
flakyness. This also ups the timeout time for actually running the test. We don't know what the tests do (some of the file ones do a lot of I/O), so the short timeout is somewhat dangerous. We have not historically had many problems with hanging tests other than problems with startup (which has a shorter timeout), so I think the longer test timeout is unlikely to cause problems. TEST=this is BUG=none Review URL: http://codereview.chromium.org/5743002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/tests/testing_instance.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ppapi/tests/testing_instance.cc b/ppapi/tests/testing_instance.cc
index 3f42d415..34ec749 100644
--- a/ppapi/tests/testing_instance.cc
+++ b/ppapi/tests/testing_instance.cc
@@ -93,6 +93,8 @@ void TestingInstance::AppendError(const std::string& message) {
}
void TestingInstance::ExecuteTests(int32_t unused) {
+ SetCookie("STARTUP_COOKIE", "STARTED");
+
// Clear the console.
// This does: window.document.getElementById("console").innerHTML = "";
pp::Var window = GetWindowObject();
@@ -168,7 +170,7 @@ void TestingInstance::LogHTML(const std::string& html) {
}
void TestingInstance::SetCookie(const std::string& name,
- const std::string& value) {
+ const std::string& value) {
// window.document.cookie = "<name>=<value>; path=/"
std::string cookie_string = name + "=" + value + "; path=/";
pp::Var document = GetWindowObject().GetProperty("document");