From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 13 Apr 2018 02:58:32 +0000 (-0700)
Subject: rgw/tests_http_manager: fix initialization
X-Git-Tag: v13.1.0~270^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18932%2Fhead;p=ceph.git

rgw/tests_http_manager: fix initialization

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/test/rgw/test_http_manager.cc b/src/test/rgw/test_http_manager.cc
index 3240dc8bfc86..b8129a1f598c 100644
--- a/src/test/rgw/test_http_manager.cc
+++ b/src/test/rgw/test_http_manager.cc
@@ -53,9 +53,11 @@ int main(int argc, char** argv)
 			 CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);
 
-  curl_global_init(CURL_GLOBAL_ALL);
+  rgw_http_client_init(cct->get());
+  rgw_setup_saved_curl_handles();
   ::testing::InitGoogleTest(&argc, argv);
   int r = RUN_ALL_TESTS();
-  curl_global_cleanup();
+  rgw_release_all_curl_handles();
+  rgw_http_client_cleanup();
   return r;
 }