Add HIR Torture test for SURV Ack timeout.

And also continue to execute the torture tests, if ipmi sol console
drops in b/w(check_sol_console).

Signed-off-by: Pridhiviraj Paidipeddi <[email protected]>

Author: pridhiviraj

Diff for: op-test

@@ -308,6 +308,9 @@ if OpTestConfiguration.conf.args.list_suites:
         print '{0:34}{1}'.format(key, suites[key].__doc__)
     exit(0)
 
+reload(sys)
+sys.setdefaultencoding("utf8")
+
 t = unittest.TestSuite()
 
 if OpTestConfiguration.conf.args.run_suite:

Diff for: testcases/fspresetReload.py

@@ -174,7 +174,10 @@ def check_for_fsp_host_interfaces(self):
         self.assertTrue(self.check_for_inbandipmi(), "inband ipmi interface failed after fsp rr")
         self.assertTrue(self.check_for_sensors(), "inband sensors failed after fsp rr")
         self.assertTrue(self.check_for_nvram(), "nvram interface failed after fsp rr")
-        self.check_for_sol_console()
+        try:
+            self.check_for_sol_console()
+        except:
+            pass
 
 
     def look_for_in_opal_log(self, pattern):
@@ -245,6 +248,10 @@ class HIRTorture(HIR):
     def number_of_resets(self):
         return 20
 
+class SIRTorture(SIR):
+    def number_of_resets(self):
+        return 20
+
 def suite():
     s = unittest.TestSuite()
     s.addTest(FIR())
@@ -255,4 +262,5 @@ def torture_suite():
     s = unittest.TestSuite()
     s.addTest(FIRTorture())
     s.addTest(HIRTorture())
+    s.addTest(SIRTorture())
     return s