From badbee64a34b37f82c5a5bed0afb00302f563e51 Mon Sep 17 00:00:00 2001
From: Julia <611228+hithwen@users.noreply.github.com>
Date: Fri, 27 Mar 2020 13:36:39 +0100
Subject: [PATCH] Fix e2e test (#6167)

* Fix activeMQ e2e
* Leave default value examples
---
 activemq/assets/configuration/spec.yaml                 | 3 +++
 activemq/datadog_checks/activemq/data/conf.yaml.example | 4 ++--
 activemq/tests/conftest.py                              | 7 +++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/activemq/assets/configuration/spec.yaml b/activemq/assets/configuration/spec.yaml
index 5f56060e41ba6..04eb27a436c68 100644
--- 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
index 17bb42b8f44cc..9edf527fd6678 100644
--- 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
index 457f99e7b484a..d3b6f543fe0b3 100644
--- 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}