From: Kefu Chai <kchai@redhat.com>
Date: Tue, 20 Oct 2020 05:47:26 +0000 (+0800)
Subject: test/test_ipaddr: avoid using global
X-Git-Tag: v16.1.0~796^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6c30b076bacd8fbd8b8dfa5dad79ec19cf8ad5b;p=ceph.git

test/test_ipaddr: avoid using global

the CephContext created using `new` would suffice

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

diff --git a/src/test/test_ipaddr.cc b/src/test/test_ipaddr.cc
index 001d2d7d5751f..91a021c18a2d3 100644
--- a/src/test/test_ipaddr.cc
+++ b/src/test/test_ipaddr.cc
@@ -1,6 +1,5 @@
 #include "include/ipaddr.h"
 #include "common/pick_address.h"
-#include "global/global_context.h"
 #include "gtest/gtest.h"
 #include "include/stringify.h"
 #include "common/ceph_context.h"
@@ -624,9 +623,11 @@ TEST(pick_address, find_ip_in_subnet_list)
   ipv4(&a_two, "10.2.1.123");
   ipv6(&a_three, "2001:1234:5678:90ab::cdef");
 
+  CephContext *cct = new CephContext(CEPH_ENTITY_TYPE_OSD);
+
   // match by network
   result = find_ip_in_subnet_list(
-    g_ceph_context,
+    cct,
     &one,
     CEPH_PICK_ADDRESS_IPV4,
     "10.1.0.0/16",
@@ -634,7 +635,7 @@ TEST(pick_address, find_ip_in_subnet_list)
   ASSERT_EQ((struct sockaddr*)&a_one, result);
 
   result = find_ip_in_subnet_list(
-    g_ceph_context,
+    cct,
     &one,
     CEPH_PICK_ADDRESS_IPV4,
     "10.2.0.0/16",
@@ -643,7 +644,7 @@ TEST(pick_address, find_ip_in_subnet_list)
 
   // match by eth name
   result = find_ip_in_subnet_list(
-    g_ceph_context,
+    cct,
     &one,
     CEPH_PICK_ADDRESS_IPV4,
     "10.0.0.0/8",
@@ -651,7 +652,7 @@ TEST(pick_address, find_ip_in_subnet_list)
   ASSERT_EQ((struct sockaddr*)&a_one, result);
 
   result = find_ip_in_subnet_list(
-    g_ceph_context,
+    cct,
     &one,
     CEPH_PICK_ADDRESS_IPV4,
     "10.0.0.0/8",
@@ -659,7 +660,7 @@ TEST(pick_address, find_ip_in_subnet_list)
   ASSERT_EQ((struct sockaddr*)&a_two, result);
 
   result = find_ip_in_subnet_list(
-    g_ceph_context,
+    cct,
     &one,
     CEPH_PICK_ADDRESS_IPV6,
     "2001::/16",