]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/tests_http_manager: fix initialization 18932/head
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 13 Apr 2018 02:58:32 +0000 (19:58 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 13 Apr 2018 02:59:19 +0000 (19:59 -0700)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/test/rgw/test_http_manager.cc

index 3240dc8bfc86466da02e80de282c63ba63e422a8..b8129a1f598c037f0b9caa988195b3aa74e88c6b 100644 (file)
@@ -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;
 }