commit 54b3b65292bae52cacc79b4e84743d1a84a41649
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri Jan 16 14:06:01 2015 +0100
regression-tests: update test 3
This test contained a mistake - lnst-ctl execution always failed because
no match could be found in a pool - the recipe required a machine with a
parameter and we always created pools with machines that didn't have any
parameters. However the test only checked that lnst-ctl failed and
reported success. This is now fixed.
Additionaly the functionality we tested is the same as with the removed
test 01 and is now supported as a feature. So now the test checks that
lnst-ctl succeeds.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
regression-tests/tests/3/desc | 4 ++++
regression-tests/tests/3/recipe.xml | 5 +----
regression-tests/tests/3/run.sh | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/regression-tests/tests/3/desc b/regression-tests/tests/3/desc
index 7eeaf6e..8669094 100644
--- a/regression-tests/tests/3/desc
+++ b/regression-tests/tests/3/desc
@@ -2,3 +2,7 @@ Check corner case in matching algorithm
This test checks that controller fails if it runs a recipe with just one
machine specified. The controller should fail.
+
+UPDATE:
+This is now supported in new lnst versions, the controller therefore shoudln't
+fail. Changing the recipe.xml and run.sh to reflect this.
diff --git a/regression-tests/tests/3/recipe.xml b/regression-tests/tests/3/recipe.xml
index c261555..1e7845d 100644
--- a/regression-tests/tests/3/recipe.xml
+++ b/regression-tests/tests/3/recipe.xml
@@ -1,9 +1,6 @@
<lnstrecipe>
<network>
<host id="client">
- <params>
- <param name="os" value="rhel7"/>
- </params>
<interfaces>
<eth id="nic1" label="inet">
<addresses>
@@ -16,7 +13,7 @@
<task>
<run module="IcmpPing" host="client">
<options>
- <option name="addr" value="{ip(lb,nic1)}"/>
+ <option name="addr" value="{ip(client,nic1)}"/>
<option name="count" value="40"/>
</options>
</run>
diff --git a/regression-tests/tests/3/run.sh b/regression-tests/tests/3/run.sh
index e6e9a99..50ab9ce 100755
--- a/regression-tests/tests/3/run.sh
+++ b/regression-tests/tests/3/run.sh
@@ -7,6 +7,6 @@ init_test
lnst-ctl -d run recipe.xml
rv=$?
-assert_status "error" "$rv"
+assert_status "pass" "$rv"
end_test
Show replies by date