From 75e851a6de99d57eaab3e682b249067cb6065cd0 Mon Sep 17 00:00:00 2001 From: Sahid Orentino Ferdjaoui Date: Wed, 16 Oct 2013 08:34:05 +0000 Subject: [PATCH] exercices: aggregates needs to be more flexible The actual regex checks a result in python format and because of the change in the bug 1132961, Jekins failed. I have update the regex to work with the old result and the new result. Change-Id: I393e1358f99be5f20d9ac8b3e214355a453ecfcb Closes-Bug: 1239726 --- exercises/aggregates.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/aggregates.sh b/exercises/aggregates.sh index e2baecdb11..e5fc7dec84 100755 --- a/exercises/aggregates.sh +++ b/exercises/aggregates.sh @@ -100,7 +100,7 @@ META_DATA_2_KEY=foo META_DATA_3_KEY=bar #ensure no additional metadata is set -nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}" +nova aggregate-details $AGGREGATE_ID | egrep "\|[{u ]*'availability_zone.+$AGGREGATE_A_ZONE'[ }]*\|" nova aggregate-set-metadata $AGGREGATE_ID ${META_DATA_1_KEY}=123 nova aggregate-details $AGGREGATE_ID | grep $META_DATA_1_KEY @@ -117,7 +117,7 @@ nova aggregate-details $AGGREGATE_ID | grep $META_DATA_3_KEY nova aggregate-details $AGGREGATE_ID | grep $META_DATA_2_KEY && die $LINENO "ERROR metadata was not cleared" nova aggregate-set-metadata $AGGREGATE_ID $META_DATA_3_KEY $META_DATA_1_KEY -nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}" +nova aggregate-details $AGGREGATE_ID | egrep "\|[{u ]*'availability_zone.+$AGGREGATE_A_ZONE'[ }]*\|" # Test aggregate-add/remove-host