From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 14 May 2020 12:19:56 +0000 (+0000)
Subject: Merge "Fix ssh cleanup issue for vuls test"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=a7364a2a37a3fdfc432463d9b5ddbf3fddd82fd6;hp=72e3dd8bb126087100628aeb2b31a8ab20874490

Merge "Fix ssh cleanup issue for vuls test"
---

diff --git a/tests/os/vuls/vuls.robot b/tests/os/vuls/vuls.robot
index 6095ffb..0847322 100644
--- a/tests/os/vuls/vuls.robot
+++ b/tests/os/vuls/vuls.robot
@@ -20,9 +20,7 @@ Library           SSHLibrary
 Library           OperatingSystem
 Library           BuiltIn
 Suite Setup       Open Connection And Log In
-Suite Teardown    Run Keywords
-...               Cleanup ssh
-...               Close All Connections
+Suite Teardown    Close All Connections
 
 *** Test Cases ***
 Run Vuls test
@@ -54,6 +52,8 @@ Run Vuls test
     Run Keyword If  '${status}' == 'False'  FAIL  Vulnerabilities discovered
     ...                     non-critical
 
+    Run Keyword IF  '${SSH_KEYFILE}' == 'None'  Cleanup ssh
+
 *** Keywords ***
 Run vuls for ubuntu
     ${os_version} =  SSHLibrary.Execute Command  source /etc/os-release && echo $VERSION_ID | cut -d '.' -f1