From: Haomai Wang <haomai@xsky.com>
Date: Sun, 3 Jul 2016 14:02:25 +0000 (+0800)
Subject: test_async_driver: accept new api changes
X-Git-Tag: ses5-milestone5~429^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a47ea4fe7d0422e97babc26d25616bdfa6378f3;p=ceph.git

test_async_driver: accept new api changes

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/test/msgr/test_async_driver.cc b/src/test/msgr/test_async_driver.cc
index adcbb99160e8..03ef74953efb 100644
--- a/src/test/msgr/test_async_driver.cc
+++ b/src/test/msgr/test_async_driver.cc
@@ -256,6 +256,7 @@ TEST(EventCenterTest, FileEventExpansion) {
   vector<int> sds;
   EventCenter center(g_ceph_context);
   center.init(100, 0);
+  center.set_owner();
   EventCallbackRef e(new FakeEvent());
   for (int i = 0; i < 300; i++) {
     int sd = ::socket(AF_INET, SOCK_STREAM, 0);
@@ -305,7 +306,7 @@ class CountEvent: public EventCallback {
 };
 
 TEST(EventCenterTest, DispatchTest) {
-  Worker worker1(g_ceph_context, 0), worker2(g_ceph_context, 1);
+  Worker worker1(g_ceph_context, 1), worker2(g_ceph_context, 2);
   atomic_t count(0);
   Mutex lock("DispatchTest::lock");
   Cond cond;
@@ -322,6 +323,8 @@ TEST(EventCenterTest, DispatchTest) {
   }
   worker1.stop();
   worker2.stop();
+  worker1.join();
+  worker2.join();
 }
 
 INSTANTIATE_TEST_CASE_P(