summaryrefslogtreecommitdiffstats
path: root/base/message_loop_unittest.cc
diff options
context:
space:
mode:
authorjar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-03 20:18:06 +0000
committerjar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-03 20:18:06 +0000
commit0ee1cb3b9c148d17b9181164f911fc8b949f6bdc (patch)
treeb1b0f4f165ff8934936a99dbea8458988888f2e5 /base/message_loop_unittest.cc
parent9c56e17844b240a5b87f488b79bd24d852e2cf51 (diff)
downloadchromium_src-0ee1cb3b9c148d17b9181164f911fc8b949f6bdc.zip
chromium_src-0ee1cb3b9c148d17b9181164f911fc8b949f6bdc.tar.gz
chromium_src-0ee1cb3b9c148d17b9181164f911fc8b949f6bdc.tar.bz2
This is a test, and will rollback asap after a build/test cycle starts.
I use a counter of MessageLoop::Quit() calls so that I can re-post "extra" calls when MessageLoop::Run() terminates. This assures that no quits are lost... but I'm not sure if some code abused the Quit() calls, and already posts many-too-many quits :-/. I want to see if the tree tests go red, and how the distributed reliability test responds. The test should already pass the basic unit_test and base_unittest, but I'm not sure what the rest of the UI tests etc will do. If I'm lucky, they'll be "less" flakey. ...but they may just go red all over :-( TBR git-svn-id: svn://svn.chromium.org/chrome/trunk/src@298 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop_unittest.cc')
-rw-r--r--base/message_loop_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
index 6c71c5b0..5cf4a99 100644
--- a/base/message_loop_unittest.cc
+++ b/base/message_loop_unittest.cc
@@ -731,7 +731,7 @@ TEST(MessageLoop, NonNestableInNestedLoop) {
task->set_nestable(false);
MessageLoop::current()->PostTask(FROM_HERE, task);
MessageLoop::current()->PostTask(FROM_HERE, new OrderedTasks(&order, 3));
- MessageLoop::current()->PostTask(FROM_HERE, new QuitTask(&order, 4));
+ MessageLoop::current()->PostTask(FROM_HERE, new OrderedTasks(&order, 4));
Task* non_nestable_quit = new QuitTask(&order, 5);
non_nestable_quit->set_nestable(false);
MessageLoop::current()->PostTask(FROM_HERE, non_nestable_quit);
@@ -744,8 +744,8 @@ TEST(MessageLoop, NonNestableInNestedLoop) {
EXPECT_EQ(order[ 0], TaskItem(PUMPS, 1, true));
EXPECT_EQ(order[ 1], TaskItem(ORDERERD, 3, true));
EXPECT_EQ(order[ 2], TaskItem(ORDERERD, 3, false));
- EXPECT_EQ(order[ 3], TaskItem(QUITMESSAGELOOP, 4, true));
- EXPECT_EQ(order[ 4], TaskItem(QUITMESSAGELOOP, 4, false));
+ EXPECT_EQ(order[ 3], TaskItem(ORDERERD, 4, true));
+ EXPECT_EQ(order[ 4], TaskItem(ORDERERD, 4, false));
EXPECT_EQ(order[ 5], TaskItem(PUMPS, 1, false));
EXPECT_EQ(order[ 6], TaskItem(ORDERERD, 2, true));
EXPECT_EQ(order[ 7], TaskItem(ORDERERD, 2, false));