Author: gnichols
Date: 2011-07-21 13:27:36 +0000 (Thu, 21 Jul 2011)
New Revision: 1021
Modified:
trunk/tests/usb/usb.py
trunk/v7/commandLineUI.py
Log:
711161 - v7 usb test Error: test raised exception on zero-length/non-integer prompt
response
Modified: trunk/tests/usb/usb.py
===================================================================
--- trunk/tests/usb/usb.py 2011-07-21 13:23:26 UTC (rev 1020)
+++ trunk/tests/usb/usb.py 2011-07-21 13:27:36 UTC (rev 1021)
@@ -83,7 +83,7 @@
self.result = Constants.FAIL
return 1
- self.numberOfSockets = string.atoi(self.prompt("How many USB sockets are
required to be tested? "))
+ self.numberOfSockets = self.promptInteger("How many USB sockets are required
to be tested? ")
if self.numberOfSockets < 1:
print("No USB sockets to test")
self.result = Constants.PASS
Modified: trunk/v7/commandLineUI.py
===================================================================
--- trunk/v7/commandLineUI.py 2011-07-21 13:23:26 UTC (rev 1020)
+++ trunk/v7/commandLineUI.py 2011-07-21 13:27:36 UTC (rev 1021)
@@ -34,13 +34,7 @@
sys.stdout.write(question)
if answers:
sys.stdout.write(" (")
- first = True
- for answer in answers:
- if first:
- sys.stdout.write(answer)
- first = False
- else:
- sys.stdout.write("|%s" % answer)
+ sys.stdout.write("|".join(answers))
sys.stdout.write(") ")
sys.stdout.flush()
response = sys.stdin.readline()
@@ -48,6 +42,18 @@
sys.stdout.write("response: %s" % response)
return response.strip()
+ def promptInteger(self, question):
+ while True:
+ sys.stdout.write(question)
+ sys.stdout.flush()
+ response = sys.stdin.readline()
+ try:
+ value = string.atoi(response.strip())
+ sys.stdout.write("response: %u\n" % value)
+ return value
+ except ValueError:
+ sys.stdout.write("Please enter an integer.\n")
+
def promptConfirm(self, question):
YES = "y"
SAMEASYES = ["y", "yes", "ya", "yup",
"affirmative", "roger", "go",
Show replies by date