openstack
/
heat
Code Issues Proposed changes

Merge "Revert "Disable CeilometerAlarmTest.test_alarm""

This commit is contained in:
Jenkins 2016-01-04 14:41:15 +00:00 committed by Gerrit Code Review
parent 47230473e4 a9d7623d50
commit 8e818e8823
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat_integrationtests/prepare_test_env.sh
View File

@ -38,7 +38,7 @@ iniset heat_integrationtests.conf DEFAULT minimal_image_ref cirros-0.3.4-x86_64-
# Add scenario tests to skip
# VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300
iniset heat_integrationtests.conf DEFAULT skip_scenario_test_list 'SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest, CeilometerAlarmTest.test_alarm'
iniset heat_integrationtests.conf DEFAULT skip_scenario_test_list 'SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest'
# Skip some tests for convergence until it is fixed
if [ "$ENABLE_CONVERGENCE" == "true" ] ; then