Fix e2e test (#6167)

* Fix activeMQ e2e * Leave default value examples
DataDog · Mar 27, 2020 · badbee6 · badbee6
1 parent 5f4da5b
commit badbee6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/activemq/assets/configuration/spec.yaml b/activemq/assets/configuration/spec.yaml
@@ -9,6 +9,9 @@ files:
   - template: instances
     options:
     - template: instances/jmx
+      overrides:
+        host.value.example: localhost
+        port.value.example: 1616
     - template: instances/default
   - template: logs
     example:

diff --git a/activemq/datadog_checks/activemq/data/conf.yaml.example b/activemq/datadog_checks/activemq/data/conf.yaml.example
@@ -40,12 +40,12 @@ instances:
     ## @param host - string - required
     ## JMX hostname to connect to.
     #
-  - host: <HOST>
+  - host: localhost
 
     ## @param port - integer - required
     ## JMX port to connect to.
     #
-    port: <PORT>
+    port: 1616
 
     ## @param user - string - optional
     ## User to use when connecting to JMX.

diff --git a/activemq/tests/conftest.py b/activemq/tests/conftest.py
@@ -31,10 +31,13 @@ def populate_server():
 @pytest.fixture(scope="session")
 def dd_environment():
     envs = {'JMX_PORT': str(JMX_PORT)}
+    compose_file = os.path.join(HERE, 'compose', 'docker-compose.yaml')
     with docker_run(
-        os.path.join(HERE, 'compose', 'docker-compose.yaml'),
+        compose_file,
         log_patterns=['ActiveMQ Jolokia REST API available'],
         conditions=[WaitForPortListening(HOST, TEST_PORT), populate_server],
         env_vars=envs,
     ):
-        yield load_jmx_config(), {'use_jmx': True}
+        config = load_jmx_config()
+        config['instances'][0].update({'port': str(JMX_PORT), 'host': HOST})
+        yield config, {'use_jmx': True}