On Wed, Jun 24, 2015 at 11:28:52AM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
Some old tests were designed without global N+1 redundancy for
plain instances in mind. So, to make these tests compatible with
the upcoming changes, add the (already present) option --no-capacity-checks.
Signed-off-by: Klaus Aehlig <[email protected]>
---
test/hs/shelltests/htools-hail.test | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/hs/shelltests/htools-hail.test
b/test/hs/shelltests/htools-hail.test
index b933e9c..a425eb7 100644
--- a/test/hs/shelltests/htools-hail.test
+++ b/test/hs/shelltests/htools-hail.test
@@ -39,7 +39,7 @@ echo '{"request": 0}' | ./test/hs/hail -
>>>= 0
# check that hail correctly applies the disk policy on a per-disk basis
-./test/hs/hail $TESTDATA_DIR/hail-alloc-twodisks.json
+./test/hs/hail $TESTDATA_DIR/hail-alloc-twodisks.json --no-capacity-checks
>>> /"success":true,.*,"result":\["node1"\]/
>>>= 0
@@ -58,7 +58,7 @@ echo '{"request": 0}' | ./test/hs/hail -
>>>= 0
# check that hail succeeds with the same test data, but with the network
restrictions removed
-cat $TESTDATA_DIR/hail-alloc-invalid-network.json | grep -v -e
'"network":"uuid-net-1-."' | ./test/hs/hail -
+cat $TESTDATA_DIR/hail-alloc-invalid-network.json | grep -v -e
'"network":"uuid-net-1-."' | ./test/hs/hail - --no-capacity-checks
>>> /"success":true,"info":"Request successful: Selected group: Group 2.*/
>>>= 0
@@ -155,7 +155,7 @@ cat $TESTDATA_DIR/hail-alloc-invalid-network.json | grep -v -e
'"network":"uuid-
>>>= 0
# Check interaction between policies and spindles
-./test/hs/hail $TESTDATA_DIR/hail-alloc-spindles.json
+./test/hs/hail $TESTDATA_DIR/hail-alloc-spindles.json --no-capacity-checks
>>> /"success":true,"info":"Request successful: Selected group: group2,.*FailSpindles:
2,.*"result":\["node4"\]/
>>>= 0
--
2.4.3.573.g4eafbef
LGTM
