Skip to content

Commit 68c1cc6

Browse files
authored
Fix weblogic E2E tests (#20280)
* try at commit * fix dir name * test pull always * fix * Revert "fix" This reverts commit 8b3fd2f. * revet * test * add comment * revert * Revert "revert" This reverts commit d2fc718. * Revert "add comment" This reverts commit 107d9a0. * update conditions * try wait for * sleep more * add condition * fix import * Add more sleep * another condition * format * sleep * sleep some more * test * format * test * revert * try without conditions
1 parent b38bd54 commit 68c1cc6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

weblogic/tests/compose/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
-Dcom.sun.management.jmxremote.ssl=false
2121
-Dcom.sun.management.jmxremote.port=9090
2222
-Dcom.sun.management.jmxremote.rmi.port=9090
23-
-Djava.rmi.server.hostname=0.0.0.0
23+
-Djava.rmi.server.hostname=localhost
2424
-Djavax.management.builder.initial=weblogic.management.jmx.mbeanserver.WLSMBeanServerBuilder
2525
weblogic-managed-server-1:
2626
build:
@@ -43,7 +43,7 @@ services:
4343
-Dcom.sun.management.jmxremote.ssl=false
4444
-Dcom.sun.management.jmxremote.port=9091
4545
-Dcom.sun.management.jmxremote.rmi.port=9091
46-
-Djava.rmi.server.hostname=0.0.0.0
46+
-Djava.rmi.server.hostname=localhost
4747
-Djavax.management.builder.initial=weblogic.management.jmx.mbeanserver.WLSMBeanServerBuilder
4848
MANAGED_SERV_NAME: managed-server1
4949
command: 'startManagedServer.sh'
@@ -68,7 +68,7 @@ services:
6868
-Dcom.sun.management.jmxremote.ssl=false
6969
-Dcom.sun.management.jmxremote.port=9092
7070
-Dcom.sun.management.jmxremote.rmi.port=9092
71-
-Djava.rmi.server.hostname=0.0.0.0
71+
-Djava.rmi.server.hostname=localhost
7272
-Djavax.management.builder.initial=weblogic.management.jmx.mbeanserver.WLSMBeanServerBuilder
7373
MANAGED_SERV_NAME: managed-server2
7474
command: 'startManagedServer.sh'

weblogic/tests/test_check.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import pytest
66

7+
from datadog_checks.base.constants import ServiceCheck
78
from datadog_checks.dev.jmx import JVM_E2E_METRICS_NEW
89
from datadog_checks.dev.utils import get_metadata_metrics
910

@@ -15,7 +16,7 @@ def test(dd_agent_check):
1516

1617
instance = {}
1718
aggregator = dd_agent_check(instance, rate=True)
18-
19+
aggregator.assert_service_check("weblogic.can_connect", ServiceCheck.OK)
1920
for metric in METRICS + JVM_E2E_METRICS_NEW:
2021
aggregator.assert_metric(metric)
2122

0 commit comments

Comments
 (0)