Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4929a8f

Browse files
pridhivirajstewartsmith
authored andcommittedMar 17, 2017
Fix few failures found in test execution.
Signed-off-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
1 parent 673cf1f commit 4929a8f

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed
 

‎common/OpTestBMC.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def reboot(self):
169169
def pnor_img_transfer(self,i_imageDir,i_imageName):
170170

171171
pnor_path = i_imageDir + i_imageName
172-
rsync_cmd = 'rsync -v -e "ssh -k" %s %s@%s:/tmp' % (pnor_path,
172+
rsync_cmd = 'rsync -v -e "ssh -k -o StrictHostKeyChecking=no" %s %s@%s:/tmp' % (pnor_path,
173173
self.cv_bmcUser,
174174
self.cv_bmcIP)
175175

‎common/OpTestIPMI.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,7 @@ def ipmi_wait_for_os_boot_complete_v1(self, i_timeout=10):
484484
#
485485
# @return BMC_CONST.FW_SUCCESS or raise OpTestError
486486
#
487-
def ipmi_sel_check(self,i_string):
488-
selDesc = 'Transition to Non-recoverable'
487+
def ipmi_sel_check(self, i_string="Transition to Non-recoverable"):
489488
logFile = self.cv_ffdcDir + '/' + 'host_sel_elist.log'
490489
output = self.ipmitool.run('sel elist')
491490

‎common/OpTestSystem.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ def sys_wait_for_os_boot_complete(self, i_timeout=10):
464464
#
465465
# @return BMC_CONST.FW_SUCCESS or BMC_CONST.FW_FAILED
466466
#
467-
def sys_sel_check(self,i_string):
467+
def sys_sel_check(self,i_string="Transition to Non-recoverable"):
468468
try:
469469
rc = self.cv_IPMI.ipmi_sel_check(i_string)
470470
except OpTestError as e:
@@ -1232,10 +1232,10 @@ def exit_petitboot_shell(self):
12321232
console.sendline('exit')
12331233
self.wait_for_petitboot()
12341234

1235-
def wait_for_login(self):
1235+
def wait_for_login(self, timeout=600):
12361236
console = self.console.get_console()
12371237
console.sendline('')
1238-
console.expect('login: ')
1238+
console.expect('login: ', timeout)
12391239

12401240

12411241
class OpTestFSPSystem(OpTestSystem):

0 commit comments

Comments
 (0)
Please sign in to comment.