FactoryTest : fix Front test,ok key and add MSG in RS232test
authorChang.H.S <jhs@dev3>
Thu, 9 Jun 2011 12:03:55 +0000 (21:03 +0900)
committerChang.H.S <jhs@dev3>
Thu, 9 Jun 2011 12:40:46 +0000 (21:40 +0900)
lib/python/Plugins/SystemPlugins/FactoryTest/plugin.py

index fbc61b1..0017000 100755 (executable)
@@ -1698,11 +1698,11 @@ class FrontTest_solo(Screen):
 
        def keyOk(self):
                global fronttest
-               self.fronttimer.stop()
-               eSctest.getInstance().VFD_Close()
                if self.step == 6:
                        fronttest = 1
-               self.close()
+                       self.fronttimer.stop()
+                       eSctest.getInstance().VFD_Close()
+                       self.close()
 
        def FrontAnimate(self):
                if (self.frontturnonoff==0):
@@ -1798,11 +1798,11 @@ class FrontTest_uno(Screen):
 
        def keyOk(self):
                global fronttest
-               self.fronttimer.stop()
-               eSctest.getInstance().VFD_Close()
                if self.step == 6:
                        fronttest = 1
-               self.close()
+                       self.fronttimer.stop()
+                       eSctest.getInstance().VFD_Close()
+                       self.close()
 
        def FrontAnimate(self):
                if (self.frontturnonoff==0):
@@ -1853,6 +1853,8 @@ class RS232Test(Screen):
                except:
                        print 'error'
                        rstest = 0
+               if rstest == 0:
+                       self.session.open( MessageBox, _("RS232 Test Failed!\nPress 'EXIT' button!"), MessageBox.TYPE_ERROR)
                self.close()
 
        def keyCancel(self):