Author: gnichols
Date: 2010-02-24 01:58:46 +0000 (Wed, 24 Feb 2010)
New Revision: 389
Modified:
trunk/tests/suspend/suspend.py
Log:
555903 - suspend tests should provide a method/param to disable the fn+ key tests individually
Modified: trunk/tests/suspend/suspend.py
===================================================================
--- trunk/tests/suspend/suspend.py 2010-02-24 01:51:28 UTC (rev 388)
+++ trunk/tests/suspend/suspend.py 2010-02-24 01:58:46 UTC (rev 389)
@@ -123,7 +123,10 @@
return self.suspendWithOSCommand(method)
# otherwise
- if source == Constants.FunctionKey:
+ if source == Constants.FunctionKey:
+ if not self.promptConfirm("Does this system have a function key (Fn) to suspend the system to %s?" % method):
+ print "Warning: suspend test to %s not run from function key" % method
+ return False
if not self.promptConfirm("Please press the function key (Fn) to suspend the system to %s " % method):
return False
return True
@@ -178,7 +181,14 @@
def runSuspendResume(self, source, method):
- return self.suspend(source, method) and self.checkResume(source, method)
+ if self.suspend(source, method):
+ return self.checkResume(source, method)
+ elif source == Constants.FunctionKey:
+ # allow user to opt-out of fn key tests, since system may not have them
+ self.verifiedResumeMethod = method
+ return True
+ #otherwise
+ return False
def run(self):