Refactor jmx port

DataDog · Feb 23, 2020 · 14d8dfc · 14d8dfc
1 parent 665dc11
commit 14d8dfc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/activemq/tests/common.py b/activemq/tests/common.py
@@ -8,6 +8,8 @@
 HERE = get_here()
 HOST = get_docker_hostname()
 
+JMX_PORT = 1616
+
 TEST_QUEUES = ('FOO_QUEUE', 'TEST_QUEUE')
 TEST_TOPICS = ('FOO_TOPIC', 'TEST_TOPIC')
 TEST_MESSAGE = {'body': 'test_message'}

diff --git a/activemq/tests/compose/docker-compose.yaml b/activemq/tests/compose/docker-compose.yaml
@@ -6,12 +6,11 @@ services:
     container_name: dd-test-activemq-server
     environment:
       ACTIVEMQ_SUNJMX_START: >-
-        -Dcom.sun.management.jmxremote.port=1616
-        -Dcom.sun.management.jmxremote.rmi.port=1616
+        -Dcom.sun.management.jmxremote.port=${JMX_PORT}
+        -Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT}
         -Dcom.sun.management.jmxremote.ssl=false
         -Dcom.sun.management.jmxremote.authenticate=false
         -Djava.rmi.server.hostname=localhost
     ports:
-      - "61616:61616"
       - "8161:8161"
-      - "1616:1616"
+      - "${JMX_PORT}:${JMX_PORT}"
diff --git a/activemq/tests/conftest.py b/activemq/tests/conftest.py
@@ -12,7 +12,7 @@
 from datadog_checks.dev.conditions import WaitForPortListening
 from datadog_checks.dev.utils import load_jmx_config
 
-from .common import BASE_URL, HERE, HOST, TEST_AUTH, TEST_MESSAGE, TEST_PORT, TEST_QUEUES, TEST_TOPICS
+from .common import BASE_URL, HERE, HOST, TEST_AUTH, TEST_MESSAGE, TEST_PORT, TEST_QUEUES, TEST_TOPICS, JMX_PORT
 
 
 def populate_server():
@@ -30,9 +30,11 @@ def populate_server():
 
 @pytest.fixture(scope="session")
 def dd_environment():
+    envs = {'JMX_PORT': str(JMX_PORT)}
     with docker_run(
         os.path.join(HERE, 'compose', 'docker-compose.yaml'),
         log_patterns=['ActiveMQ Jolokia REST API available'],
         conditions=[WaitForPortListening(HOST, TEST_PORT), populate_server],
+        env_vars=envs
     ):
         yield load_jmx_config(), {'use_jmx': True}