summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dbus/end_to_end_async_unittest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/dbus/end_to_end_async_unittest.cc b/dbus/end_to_end_async_unittest.cc
index 707c4d8..150ed29 100644
--- a/dbus/end_to_end_async_unittest.cc
+++ b/dbus/end_to_end_async_unittest.cc
@@ -64,6 +64,9 @@ class EndToEndAsyncTest : public testing::Test {
base::Unretained(this)),
base::Bind(&EndToEndAsyncTest::OnConnected,
base::Unretained(this)));
+ // Wait until the object proxy is connected to the signal.
+ message_loop_.Run();
+
// Connect to the "Test2" signal of "org.chromium.TestInterface" from
// the remote object. There was a bug where we were emitting error
// messages like "Requested to remove an unknown match rule: ..." at
@@ -285,8 +288,7 @@ TEST_F(EndToEndAsyncTest, EmptyResponseCallback) {
// check if the test does not crash.
}
-// Flaky, http://crbug.com/107301
-TEST_F(EndToEndAsyncTest, FLAKY_TestSignal) {
+TEST_F(EndToEndAsyncTest, TestSignal) {
const char kMessage[] = "hello, world";
// Send the test signal from the exported object.
test_service_->SendTestSignal(kMessage);
@@ -296,8 +298,7 @@ TEST_F(EndToEndAsyncTest, FLAKY_TestSignal) {
ASSERT_EQ(kMessage, test_signal_string_);
}
-// Flaky, http://crbug.com/106796
-TEST_F(EndToEndAsyncTest, FLAKY_TestSignalFromRoot) {
+TEST_F(EndToEndAsyncTest, TestSignalFromRoot) {
const char kMessage[] = "hello, world";
// Send the test signal from the root object path, to see if we can
// handle signals sent from "/", like dbus-send does.