commit 83ddef769168d6373646c99ad736a0b2e09735cb Author: Ondrej Lichtner olichtne@redhat.com Date: Fri Aug 16 10:02:01 2013 +0200

smoke tests: fix expect values

Values of the expect attribute are generated based on values stored in the variables.conf file.

Signed-off-by: Ondrej Lichtner olichtne@redhat.com Signed-off-by: Jiri Pirko jiri@resnulli.us

recipes/smoke/lib/task-bg.xml | 4 ++-- recipes/smoke/lib/task-ping.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- diff --git a/recipes/smoke/lib/task-bg.xml b/recipes/smoke/lib/task-bg.xml index eea6ef3..b9388d2 100644 --- a/recipes/smoke/lib/task-bg.xml +++ b/recipes/smoke/lib/task-bg.xml @@ -8,5 +8,5 @@ </options> </run> <ctl_wait seconds="5"/> - <intr bg_id="1" expect="fail" machine="1" timeout="30"/> -</task> \ No newline at end of file + <intr bg_id="1" expect="#icmp_result#" machine="1" timeout="30"/> +</task> diff --git a/recipes/smoke/lib/task-ping.xml b/recipes/smoke/lib/task-ping.xml index 8e84d7e..1c275f7 100644 --- a/recipes/smoke/lib/task-ping.xml +++ b/recipes/smoke/lib/task-ping.xml @@ -1,5 +1,5 @@ <task> - <run expect="fail" machine="1" module="IcmpPing" timeout="30"> + <run expect="#icmp_result#" machine="1" module="IcmpPing" timeout="30"> <options> <option name="addr" value="{ip(2,testiface)}"/> <option name="count" value="40"/> @@ -7,4 +7,4 @@ <option name="limit_rate" value="95"/> </options> </run> -</task> \ No newline at end of file +</task>