summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 03:29:21 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 03:29:21 +0000
commit59db1a6ed04e9a373fdf2cb9fc75a5e9b66dc8ae (patch)
tree9ad9ec0b3e17e9c9fe130eeded393f3edf5a889c /chrome/worker
parentedb7c860f97a0fadc7cda85b5a4581941a7f00bf (diff)
downloadchromium_src-59db1a6ed04e9a373fdf2cb9fc75a5e9b66dc8ae.zip
chromium_src-59db1a6ed04e9a373fdf2cb9fc75a5e9b66dc8ae.tar.gz
chromium_src-59db1a6ed04e9a373fdf2cb9fc75a5e9b66dc8ae.tar.bz2
Mark a ui test as flaky on windows.
TBR=jam BUG=22608 Review URL: http://codereview.chromium.org/262003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index cc4331a..633bc63 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -10,6 +10,12 @@
static const char kTestCompleteCookie[] = "status";
static const char kTestCompleteSuccess[] = "OK";
+#if defined(OS_WIN)
+#define MAYBE_LimitTotal FLAKY_LimitTotal
+#else
+#define MAYBE_LimitTotal LimitTotal
+#endif
+
class WorkerTest : public UILayoutTest {
protected:
virtual ~WorkerTest() { }
@@ -207,7 +213,7 @@ TEST_F(WorkerTest, LimitPerPage) {
}
#endif
-TEST_F(WorkerTest, LimitTotal) {
+TEST_F(WorkerTest, MAYBE_LimitTotal) {
int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
int total_workers = WorkerService::kMaxWorkersWhenSeparate;