Fix for SSH connection loss after FFDC.
Resolves openbmc/openbmc-test-automation#391
Change-Id: I61f148fbfdb39fe410e2d0530c2a7a5be09ebddb
Signed-off-by: Rahul Maheshwari <rahulmaheshwari@in.ibm.com>
diff --git a/tests/test_bmc_devicetree.robot b/tests/test_bmc_devicetree.robot
index bf6aeec..5062649 100644
--- a/tests/test_bmc_devicetree.robot
+++ b/tests/test_bmc_devicetree.robot
@@ -5,9 +5,8 @@
Resource ../lib/ipmi_client.robot
Library String
-Suite Setup Open Connection And Log In
-Suite Teardown Close All Connections
-Test Teardown FFDC On Test Case Fail
+Test Setup Open Connection And Log In
+Test Teardown Post Test Case Execution
*** Variables ***
${devicetree_base} /sys/firmware/devicetree/base/
@@ -119,3 +118,11 @@
Should Be Empty ${stderr}
${length}= Get Length ${output}
Should Be True ${length} > 1
+
+Post Test Case Execution
+ [Documentation] Do the post test teardown.
+ ... 1. Capture FFDC on test failure.
+ ... 2. Close all open SSH connections.
+
+ FFDC On Test Case Fail
+ Close All Connections
diff --git a/tests/test_eventlog.robot b/tests/test_eventlog.robot
index 674fab2..be713b5 100644
--- a/tests/test_eventlog.robot
+++ b/tests/test_eventlog.robot
@@ -10,9 +10,8 @@
Library Collections
-Suite Setup Open Connection And Log In
-Suite Teardown Close All Connections
-Test Teardown FFDC On Test Case Fail
+Test Setup Open Connection And Log In
+Test Teardown Post Test Case Execution
Force Tags Event_Logging
@@ -227,3 +226,11 @@
${LOGID}= convert to integer ${json['data']}
${uri}= catenate SEPARATOR= ${EVENT_RECORD} ${LOGID}
[Return] ${uri}
+
+Post Test Case Execution
+ [Documentation] Do the post test teardown.
+ ... 1. Capture FFDC on test failure.
+ ... 2. Close all open SSH connections.
+
+ FFDC On Test Case Fail
+ Close All Connections
diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index 8f805c4..d6cfb3f 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -5,15 +5,14 @@
... Notice how connections are handled as part of the suite setup and
... teardown. This saves some time when executing several test cases.
-Resource ../lib/rest_client.robot
-Resource ../lib/ipmi_client.robot
-Resource ../lib/openbmc_ffdc.robot
-Library ../data/model.py
+Resource ../lib/rest_client.robot
+Resource ../lib/ipmi_client.robot
+Resource ../lib/openbmc_ffdc.robot
+Library ../data/model.py
Suite setup Setup The Suite
-Suite Teardown Close All Connections
-Test Teardown FFDC On Test Case Fail
-
+Test Setup Open Connection And Log In
+Test Teardown Post Test Case Execution
*** Variables ***
${model}= ${OPENBMC_MODEL}
@@ -358,3 +357,11 @@
[Arguments] ${name}
${x}= get inventory sensor ${OPENBMC_MODEL} ${name}
[Return] ${x}
+
+Post Test Case Execution
+ [Documentation] Do the post test teardown.
+ ... 1. Capture FFDC on test failure.
+ ... 2. Close all open SSH connections.
+
+ FFDC On Test Case Fail
+ Close All Connections
diff --git a/tests/test_time.robot b/tests/test_time.robot
index a1d5697..cb98cb9 100644
--- a/tests/test_time.robot
+++ b/tests/test_time.robot
@@ -10,9 +10,8 @@
Library OperatingSystem
Library DateTime
-Suite Setup Open Connection And Log In
-Suite Teardown Close All Connections
-Test Teardown Post Test Execution
+Test Setup Open Connection And Log In
+Test Teardown Post Test Case Execution
*** Variables ***
${SYSTEM_TIME_INVALID} 01/01/1969 00:00:00
@@ -398,11 +397,13 @@
... Should Be True ${host_diff_set_new} <= ${time_duration}
-Post Test Execution
- [Documentation] Perform operations after test execution. Capture FFDC
- ... in case of test case failure and sets default values for time mode
- ... and owner.
+Post Test Case Execution
+ [Documentation] Do the post test teardown.
+ ... 1. Capture FFDC on test failure.
+ ... 2. Sets defaults for time mode and owner.
+ ... 3. Close all open SSH connections.
- Run Keyword If Test Failed FFDC On Test Case Fail
+ FFDC On Test Case Fail
Set Time Owner BMC
Set Time Mode NTP
+ Close All Connections