This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new f3b52113df Fix UT K8sTagTest. (#9945)
f3b52113df is described below
commit f3b52113df698509e2a0ee3996ce81a08064a45f
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Thu Nov 10 23:30:25 2022 +0800
Fix UT K8sTagTest. (#9945)
---
.../org/apache/skywalking/oap/meter/analyzer/dsl/K8sTagTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/K8sTagTest.java
b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/K8sTagTest.java
index f0f7fd50a5..7ceda7d9f3 100644
---
a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/K8sTagTest.java
+++
b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/K8sTagTest.java
@@ -34,6 +34,7 @@ import java.util.Optional;
import io.kubernetes.client.openapi.models.V1ServiceStatus;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
+import org.apache.skywalking.library.kubernetes.KubernetesClient;
import org.apache.skywalking.library.kubernetes.KubernetesPods;
import org.apache.skywalking.library.kubernetes.KubernetesServices;
import org.apache.skywalking.library.kubernetes.ObjectID;
@@ -60,7 +61,7 @@ import static org.junit.Assert.fail;
@PowerMockIgnore({"javax.net.ssl.*", "javax.management.*"})
@RunWith(PowerMockRunner.class)
@PowerMockRunnerDelegate(Parameterized.class)
-@PrepareForTest({KubernetesPods.class, KubernetesServices.class})
+@PrepareForTest({KubernetesPods.class, KubernetesServices.class,
KubernetesClient.class})
public class K8sTagTest {
@Parameterized.Parameter
@@ -257,8 +258,7 @@ public class K8sTagTest {
@SneakyThrows
@Before
public void setup() {
- PowerMockito.mockStatic(KubernetesServices.class);
- PowerMockito.mockStatic(KubernetesPods.class);
+ PowerMockito.mockStatic(KubernetesClient.class);
Whitebox.setInternalState(KubernetesServices.class, "INSTANCE",
Mockito.mock(KubernetesServices.class)