From 388a02960419006ffc20b56c45c3f4528bb262b4 Mon Sep 17 00:00:00 2001
From: "Brad P. Crochet" <brad@redhat.com>
Date: Tue, 10 Jan 2017 09:27:32 -0500
Subject: [PATCH] Re-enable mistral tests and set threads to 1
Mistral running on mod_wsgi should only have 1 thread per worker. This
sets threads to 1 and reenabled all Mistral smoke tests.
Change-Id: I2f423b42cbff35449e8f59dcbde113dc88038f78
Closes-Bug: #1671505
---
manifests/mistral.pp | 1 +
run_tests.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/manifests/mistral.pp b/manifests/mistral.pp
index 4df2a710d..325d030c1 100644
--- a/manifests/mistral.pp
+++ b/manifests/mistral.pp
@@ -62,6 +62,7 @@ class openstack_integration::mistral {
ssl_key => "/etc/mistral/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path,
workers => 2,
+ threads => 1,
}
class { '::mistral::client': }
class { '::mistral::engine': }
diff --git a/run_tests.sh b/run_tests.sh
index f5f14f230..cff389dc6 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -306,7 +306,7 @@ if uses_debs; then
# 1) fwaas tests from ubuntu are still out of date LP#1667736
EXCLUDES="--regex=^(?!neutron_fwaas.tests.tempest_plugin.tests.api.test_fwaas_extensions.*$)(?!mistral_tempest_tests.tests.api.v2.test_executions.ExecutionTestsV2.test_get_list_executions.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v2_notifications.*$).*"
else
- EXCLUDES="--regex=^(?!mistral_tempest_tests.tests.api.v2.test_executions.ExecutionTestsV2.test_get_list_executions.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v2_notifications.*$).*"
+ EXCLUDES="--regex=^(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v2_notifications.*$).*"
fi
print_header 'Running Tempest'
cd /tmp/openstack/tempest