From ec9b8abb4a481256eb325e8969ef591a9e965098 Mon Sep 17 00:00:00 2001 From: gsmselftest Date: Sun, 30 Oct 2011 19:04:45 +0100 Subject: device not ready message added --- For Weekly Test/tricode/ControllerClass.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'For Weekly Test/tricode/ControllerClass.py') diff --git a/For Weekly Test/tricode/ControllerClass.py b/For Weekly Test/tricode/ControllerClass.py index 498799d..1a25361 100755 --- a/For Weekly Test/tricode/ControllerClass.py +++ b/For Weekly Test/tricode/ControllerClass.py @@ -64,7 +64,7 @@ class doTheTest: self.startCall() self.waitingFeedback() - elif destHandler == 'DEVICE NOT WORK': + elif destHandler == 'DEVICE NOT READY': self.testResult == 802 logger.logEvent('802 General Device Error: Destination device no respond timeout') self.initTerminate() @@ -73,8 +73,8 @@ class doTheTest: logger.logEvent('604 General Handler Error: Destination handler no respond timeout') self.initTerminate() - elif self.connected == 'DEVICE NOT WORK': - self.testResult == 802 + elif self.connected == 'DEVICE NOT READY': + self.testResult = 802 logger.logEvent('802 General Device Error: Destination device no respond timeout') self.initTerminate() else: @@ -91,7 +91,7 @@ class doTheTest: self.caller.closeConnection() self.initCancelTest() - elif self.connected == 'DEVICE NOT WORK': + elif self.connected == 'DEVICE NOT READY': self.testResult = 801 self.caller.sendData('TERMINATE CONNECTION') self.caller.closeConnection() @@ -115,11 +115,16 @@ class doTheTest: self.resultDest = self.receiver.receiveData(20) self.resultCaller = self.caller.receiveData(20) #print 'result '+self.resultCaller+'--'+self.resultDest - if self.resultCaller == 'DEVICE NOT WORK': - logger.logEvent('Caller device not work') + if self.resultCaller == 'DEVICE NOT READY': + logger.logEvent('Caller DEVICE NOT READY') self.testResult = 801 self.initTerminate() + elif self.dest == 'DEVICE NOT READY': + logger.logEvent('Caller DEVICE NOT READY') + self.testResult = 802 + self.initTerminate() + elif self.resultCaller == 'CALL OK' and self.resultDest =='CALL OK': logger.logEvent('Test Succeed') self.testResult = 200 @@ -232,7 +237,7 @@ class doTheTest: self.connected = 'OK' else: logger.logEvent('Connect to Caller but device doesnt work') - self.connected = 'DEVICE NOT WORK' + self.connected = 'DEVICE NOT READY' else: logger.logEvent('Cannt connect to Caller') self.connected = 'NOT OK' @@ -253,7 +258,7 @@ class doTheTest: else: logger.logEvent('connect to Receiver but device doesnt work') - self.connected = 'DEVICE NOT WORK' + self.connected = 'DEVICE NOT READY' else: logger.logEvent('Cannt connect to Receiver') self.connected = 'NOT OK' -- cgit v1.2.3-55-g7522