Import ceph 15.2.8

[ceph.git] / ceph / src / test / immutable_object_cache / MockCacheDaemon.h

diff --git a/ceph/src/test/immutable_object_cache/MockCacheDaemon.h b/ceph/src/test/immutable_object_cache/MockCacheDaemon.h
index 71fd062650b54deb3f3688715d364c4304c99360..3773e87ea9a2fcc10f4f7d86eeffc8c02a070f02 100644 (file)
--- a/ceph/src/test/immutable_object_cache/MockCacheDaemon.h
+++ b/ceph/src/test/immutable_object_cache/MockCacheDaemon.h
@@ -24,14 +24,8 @@ class MockCacheClient {
   MOCK_METHOD0(stop, void());
   MOCK_METHOD0(connect, int());
   MOCK_METHOD1(connect, void(Context*));
-  void lookup_object(std::string pool_nspace, uint64_t pool_id, uint64_t snap_id,
-              std::string oid, CacheGenContextURef&& on_finish) {
-    // gmock don't support move
-    internal_lookup(pool_nspace, pool_id, snap_id, oid);
-  };
-  MOCK_METHOD4(internal_lookup, void(std::string pool_nspace,
-                uint64_t pool_id, uint64_t snap_id, 
-                std::string oid));
+  MOCK_METHOD5(lookup_object, void(std::string, uint64_t, uint64_t, std::string,
+                                   CacheGenContextURef));
   MOCK_METHOD1(register_client, int(Context*));
 };