commit 31cca93edb43e20fa7aa27b17a8ab56fa7549642
author Petr Michalec <pmichalec@mirantis.com> Wed Jan 10 09:38:15 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Wed Jan 10 09:38:15 2018 +0000
tree 606e20d9e37abd0e135912d3527a47550ff3a883
parent ecc02e175c6e0c5dcb9a3241b63181db06e225d3
parent 16a786fa4dc52de6e438277e27fc75f69eaacb47

Merge "Optimize kitchen tests for Travis CI"

ceilometer/files/ocata/ceilometer.apache2.conf.Debian

diff --git a/ceilometer/files/ocata/ceilometer.apache2.conf.Debian b/ceilometer/files/ocata/ceilometer.apache2.conf.Debian
index 988ab30..a0406fe 100644
--- a/ceilometer/files/ocata/ceilometer.apache2.conf.Debian
+++ b/ceilometer/files/ocata/ceilometer.apache2.conf.Debian
@@ -2,7 +2,7 @@
 Listen {{ server.bind.host }}:{{ server.bind.port }}
 
 <VirtualHost *:{{ server.bind.port }}>
-    WSGIDaemonProcess ceilometer-api processes=2 threads=10 user=ceilometer display-name=%{GROUP}
+    WSGIDaemonProcess ceilometer-api processes=2 threads=10 user=ceilometer group=ceilometer display-name=%{GROUP}
     WSGIProcessGroup ceilometer-api
     WSGIScriptAlias / /usr/share/ceilometer/app.wsgi
     WSGIApplicationGroup %{GLOBAL}

ceilometer/meta/telegraf.yml

diff --git a/ceilometer/meta/telegraf.yml b/ceilometer/meta/telegraf.yml
index 4db03b7..074db4f 100644
--- a/ceilometer/meta/telegraf.yml
+++ b/ceilometer/meta/telegraf.yml
@@ -5,5 +5,5 @@
     http_response:
       ceilometer-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 8c07e58..ea1a363 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -111,7 +111,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} $*
 }