From: Kefu Chai <kchai@redhat.com>
Date: Thu, 5 Nov 2020 04:44:21 +0000 (+0800)
Subject: test/crimson: do not support variadic future
X-Git-Tag: v16.1.0~681^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c3340e7c0877ab4435ac7f8203d477ddb3cba68c;p=ceph.git

test/crimson: do not support variadic future

also add "unittest-seastar-errorator" to unit test.

this should address the build failure introduced by
688b95798bfd88b409abce9b70bb6d2933819bef

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/crimson/CMakeLists.txt b/src/test/crimson/CMakeLists.txt
index 5d2caa119109..db1ed85d8add 100644
--- a/src/test/crimson/CMakeLists.txt
+++ b/src/test/crimson/CMakeLists.txt
@@ -77,4 +77,4 @@ add_executable(unittest-seastar-errorator
 target_link_libraries(
   unittest-seastar-errorator
   crimson::gtest)
-
+add_ceph_unittest(unittest-seastar-errorator)
diff --git a/src/test/crimson/test_errorator.cc b/src/test/crimson/test_errorator.cc
index 08f053725be6..3d5c3567b8eb 100644
--- a/src/test/crimson/test_errorator.cc
+++ b/src/test/crimson/test_errorator.cc
@@ -8,10 +8,8 @@
 
 struct do_until_test_t : public seastar_test_suite_t {
   using ertr = crimson::errorator<crimson::ct_error::invarg>;
-  template <class... ValuesT>
-  using future = ertr::future<ValuesT...>;
-  future<> test() {
-    return crimson::do_until([this]() -> future<bool> {
+  ertr::future<> test() {
+    return crimson::do_until([this] {
       if (i < 5) {
         ++i;
         return ertr::make_ready_future<bool>(false);