commit a1a60e4a59e0e86d3c62d41de86dcd5aa591b15d
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Dec 21 10:27:03 2017 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Thu Dec 21 10:27:03 2017 +0000
tree 94f96e776dea6ab80320ceffd9788546048936d2
parent 66e71d3f8fd383a94cf830e809d767496bafc302
parent da504ce7d19865f6d8b9bd4eda599b567ccc8ecb

Merge "Satisfy dependencies in kitchen tests"

aodh/meta/telegraf.yml

diff --git a/aodh/meta/telegraf.yml b/aodh/meta/telegraf.yml
index 695d1ba..6fe905c 100644
--- a/aodh/meta/telegraf.yml
+++ b/aodh/meta/telegraf.yml
@@ -5,5 +5,5 @@
     http_response:
       aodh-api:
         address: "http://{{ server.bind.host|replace('0.0.0.0', '127.0.0.1') }}:{{ server.bind.port }}/"
-        expected_code: 300
-{%- endif %}
\ No newline at end of file
+        expected_code: 401
+{%- endif %}

tests/run_tests.sh

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 29fb975..4ee4e0f 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -124,7 +124,7 @@
 }
 
 salt_run() {
-    [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+    [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
     salt-call ${SALT_OPTS} $*
 }