base/message_pump_io_ios_unittest.cc - Issue 11431003: roll gtest 621:629 and gmock 405:410

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/message_pump_io_ios_unittest.cc

Issue 11431003: roll gtest 621:629 and gmock 405:410 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comment Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/message_pump_io_ios_unittest.cc

diff --git a/base/message_pump_io_ios_unittest.cc b/base/message_pump_io_ios_unittest.cc

index ddf740f24693e52b6925e72431653fba16303a2f..7a00d119de428d3d0c324efdda359e90e6914ada 100644

--- a/base/message_pump_io_ios_unittest.cc

+++ b/base/message_pump_io_ios_unittest.cc

@@ -79,7 +79,7 @@ TEST_F(MessagePumpIOSForIOTest, TestWatchingFromBadThread) {

MessagePumpIOSForIO::FileDescriptorWatcher watcher;

StupidWatcher delegate;

- ASSERT_DEBUG(io_loop()->WatchFileDescriptor(

+ ASSERT_DEBUG_DEATH(io_loop()->WatchFileDescriptor(

STDOUT_FILENO, false, MessageLoopForIO::WATCH_READ, &watcher, &delegate),

"Check failed: "

"watch_file_descriptor_caller_checker_.CalledOnValidThread()");

« no previous file with comments | « DEPS ('k') | testing/gtest.gyp » ('j') | no next file with comments »