aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2016-10-24 11:05:03 +0200
committerMatej Klotton <mklotton@cisco.com>2016-10-24 15:29:45 +0000
commit64b8f55af5dd6a0e7f360186cbd60ed788040939 (patch)
tree968cdddeb8af2aec01bc23de8b22352ef637d0b2
parentd0a388627a90c526ae6e6d87ca00d428ed8aac64 (diff)
Use only Qemu Kill on the teardown of double qemu setup
- do not use Qemu System Powerdown or Qemu Quit in the teardown of double qemu setup - use just Qemu Kill there Change-Id: I8dd1e4055e0adb5d306e3a9904090a271d17c3e5 Signed-off-by: Jan Gelety <jgelety@cisco.com>
-rw-r--r--resources/libraries/robot/double_qemu_setup.robot8
1 files changed, 1 insertions, 7 deletions
diff --git a/resources/libraries/robot/double_qemu_setup.robot b/resources/libraries/robot/double_qemu_setup.robot
index 8a262c29ba..d8b32bd2fa 100644
--- a/resources/libraries/robot/double_qemu_setup.robot
+++ b/resources/libraries/robot/double_qemu_setup.robot
@@ -87,15 +87,9 @@
| | ...
| | [Arguments] | ${dut_node} | ${vm} | ${qemu_name}
| | ${set_node}= | Replace Variables | ${qemu_name}.Qemu Set Node
-| | ${sys_status}= | Replace Variables | ${qemu_name}.Qemu System Status
| | ${kill}= | Replace Variables | ${qemu_name}.Qemu Kill
-| | ${sys_pd}= | Replace Variables | ${qemu_name}.Qemu System Powerdown
-| | ${quit}= | Replace Variables | ${qemu_name}.Qemu Quit
| | ${clear_socks}= | Replace Variables | ${qemu_name}.Qemu Clear Socks
| | Run Keyword | ${set_node} | ${dut_node}
-| | ${status} | ${value}= | Run Keyword And Ignore Error | ${sys_status}
-| | Run Keyword If | "${status}" == "FAIL" | ${kill}
-| | ... | ELSE IF | "${value}" == "running" | ${sys_pd}
-| | ... | ELSE | ${quit}
+| | Run Keyword | ${kill}
| | Run Keyword | ${clear_socks}
| | Run Keyword If | ${vm} is not None | Disconnect | ${vm}