[testudo] strip spaces from serial number

Signed-off-by: Christopher Hall <hsw@openmoko.com>
wikireader · Apr 2, 2010 · 748346c · 748346c
1 parent f71f384
commit 748346c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/testudo/src/ui.py b/testudo/src/ui.py
@@ -103,9 +103,10 @@ def runTest(self, count):
 
         auto = self.autoSave.get_active() and 1 == count
         self.autoSave.set_active(auto)
+        serial_number = self.serialNumber.get_text().strip()
 
         try:
-            if '' == self.serialNumber.get_text():
+            if '' == serial_number:
                 raise StopTestException('Serial number invalid')
 
             if auto:
@@ -119,10 +120,10 @@ def runTest(self, count):
 
             for cycle in range(1, count + 1):
                 self.write('\n*** Start of Test %d of %d for PCBA SN: %s ***\n\n' %
-                           (cycle, count, self.serialNumber.get_text()))
+                           (cycle, count, serial_number))
 
                 t = time.time()
-                sequencer.runOneTest(self, self.fileName, 0, serial_number = self.serialNumber.get_text())
+                sequencer.runOneTest(self, self.fileName, 0, serial_number = serial_number)
                 t = time.time() - t
 
                 self.write('\n*** End of Test %d of %d [%7.3f seconds] ***\n' % (cycle, count, t))
@@ -237,7 +238,7 @@ def save_file(self, autoSave = False):
             tag = '.FAIL'
         else:
             tag = '.OK'
-        sn = self.serialNumber.get_text()
+        sn = self.serialNumber.get_text().strip()
         if '' == sn:
             sn = 'NO-SERIAL-NUMBER'
 

diff --git a/testudo/src/ui2.py b/testudo/src/ui2.py
@@ -190,10 +190,11 @@ def runTest(self):
             psu = None
 
             s = SerialPort()
-            if '' == self.serialNumber.get_text():
+            serialNumber = self.serialNumber.get_text().strip()
+            versionNumber = self.versionNumber.get_text().strip()
+
+            if '' == serialNumber:
                 raise StopTestException('Serial number invalid')
-            serialNumber = self.serialNumber.get_text()
-            versionNumber = self.versionNumber.get_text()
 
             program = ProgramPin()
 
@@ -370,7 +371,7 @@ def save_file(self, autoSave = False):
             tag = '.FAIL'
         else:
             tag = '.OK'
-        sn = self.serialNumber.get_text()
+        sn = self.serialNumber.get_text().strip()
         if '' == sn:
             sn = 'NO-SERIAL-NUMBER'