Skip to content

Commit

Permalink
Fix few failures found in test execution.
Browse files Browse the repository at this point in the history
Signed-off-by: Pridhiviraj Paidipeddi <[email protected]>
Signed-off-by: Stewart Smith <[email protected]>
  • Loading branch information
pridhiviraj authored and stewartsmith committed Mar 17, 2017
1 parent 673cf1f commit 4929a8f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion common/OpTestBMC.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def reboot(self):
def pnor_img_transfer(self,i_imageDir,i_imageName):

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

Expand Down
3 changes: 1 addition & 2 deletions common/OpTestIPMI.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,7 @@ def ipmi_wait_for_os_boot_complete_v1(self, i_timeout=10):
#
# @return BMC_CONST.FW_SUCCESS or raise OpTestError
#
def ipmi_sel_check(self,i_string):
selDesc = 'Transition to Non-recoverable'
def ipmi_sel_check(self, i_string="Transition to Non-recoverable"):
logFile = self.cv_ffdcDir + '/' + 'host_sel_elist.log'
output = self.ipmitool.run('sel elist')

Expand Down
6 changes: 3 additions & 3 deletions common/OpTestSystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ def sys_wait_for_os_boot_complete(self, i_timeout=10):
#
# @return BMC_CONST.FW_SUCCESS or BMC_CONST.FW_FAILED
#
def sys_sel_check(self,i_string):
def sys_sel_check(self,i_string="Transition to Non-recoverable"):
try:
rc = self.cv_IPMI.ipmi_sel_check(i_string)
except OpTestError as e:
Expand Down Expand Up @@ -1232,10 +1232,10 @@ def exit_petitboot_shell(self):
console.sendline('exit')
self.wait_for_petitboot()

def wait_for_login(self):
def wait_for_login(self, timeout=600):
console = self.console.get_console()
console.sendline('')
console.expect('login: ')
console.expect('login: ', timeout)


class OpTestFSPSystem(OpTestSystem):
Expand Down

0 comments on commit 4929a8f

Please sign in to comment.