From 53a4b719667eeb5083db76d6c949b6bebd580ed0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 11 Apr 2014 17:11:24 -0700 Subject: [PATCH] ceph_test_rados_api_watch_notify: test over cache pool Signed-off-by: Sage Weil --- src/test/librados/watch_notify.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/test/librados/watch_notify.cc b/src/test/librados/watch_notify.cc index 44c2a95373df..d5864a08acd2 100644 --- a/src/test/librados/watch_notify.cc +++ b/src/test/librados/watch_notify.cc @@ -11,7 +11,7 @@ using namespace librados; typedef RadosTest LibRadosWatchNotify; -typedef RadosTestPP LibRadosWatchNotifyPP; +typedef RadosTestParamPP LibRadosWatchNotifyPP; typedef RadosTestEC LibRadosWatchNotifyEC; typedef RadosTestECPP LibRadosWatchNotifyECPP; @@ -46,7 +46,7 @@ TEST_F(LibRadosWatchNotify, WatchNotifyTest) { sem_destroy(&sem); } -TEST_F(LibRadosWatchNotifyPP, WatchNotifyTestPP) { +TEST_P(LibRadosWatchNotifyPP, WatchNotifyTestPP) { ASSERT_EQ(0, sem_init(&sem, 0, 0)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); @@ -66,8 +66,7 @@ TEST_F(LibRadosWatchNotifyPP, WatchNotifyTestPP) { ioctx.unwatch("foo", handle); sem_destroy(&sem); } - -TEST_F(LibRadosWatchNotifyPP, WatchNotifyTimeoutTestPP) { +TEST_P(LibRadosWatchNotifyPP, WatchNotifyTimeoutTestPP) { ASSERT_EQ(0, sem_init(&sem, 0, 0)); ioctx.set_notify_timeout(1); uint64_t handle; @@ -134,3 +133,7 @@ TEST_F(LibRadosWatchNotifyECPP, WatchNotifyTimeoutTestPP) { ASSERT_EQ(0, ioctx.watch("foo", 0, &handle, &ctx)); sem_destroy(&sem); } + + +INSTANTIATE_TEST_CASE_P(LibRadosWatchNotifyPPTests, LibRadosWatchNotifyPP, + ::testing::Values("", "cache")); -- 2.47.3