summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/tricode/ControllerClass.py
diff options
context:
space:
mode:
authorgsmselftest2011-10-27 18:49:14 +0200
committergsmselftest2011-10-27 18:49:14 +0200
commit8273298747a548b628e57539b74fe70521cac9ca (patch)
tree49fc1dbcd0fe6923a859f7535473af10faf1aa9e /For Weekly Test/tricode/ControllerClass.py
parenterror handle for GSM Eplus. (diff)
downloadgsm-selftest-8273298747a548b628e57539b74fe70521cac9ca.tar.gz
gsm-selftest-8273298747a548b628e57539b74fe70521cac9ca.tar.xz
gsm-selftest-8273298747a548b628e57539b74fe70521cac9ca.zip
finally
Diffstat (limited to 'For Weekly Test/tricode/ControllerClass.py')
-rwxr-xr-xFor Weekly Test/tricode/ControllerClass.py36
1 files changed, 13 insertions, 23 deletions
diff --git a/For Weekly Test/tricode/ControllerClass.py b/For Weekly Test/tricode/ControllerClass.py
index ffc1e71..592acb6 100755
--- a/For Weekly Test/tricode/ControllerClass.py
+++ b/For Weekly Test/tricode/ControllerClass.py
@@ -43,7 +43,7 @@ class doTheTest:
if self.connected == 'OK':
self.caller.sendData('CALLER|'+self.destNo)
- callerHandler = self.caller.receiveData(10)
+ callerHandler = self.caller.receiveData(20)
if callerHandler == "CALLER READY":
logger.logEvent('Caller handler : Ready')
@@ -58,17 +58,14 @@ class doTheTest:
if self.connected == 'OK':
self.receiver.sendData('RECEIVER')
- destHandler = self.receiver.receiveData(10)
+ destHandler = self.receiver.receiveData(20)
if destHandler == 'RECEIVER READY':
logger.logEvent('Receiver handler : Ready')
self.startCall()
self.waitingFeedback()
- elif destHandler == 'NO SIGNAL':
- self.testResult = 301
- self.initTerminate()
- logger.logEvent('301 General Handler Error: Destination handler have no signal')
+
else:
self.testResult = 604
logger.logEvent('604 General Handler Error: Destination handler no respond timeout')
@@ -81,10 +78,6 @@ class doTheTest:
self.caller.sendData('TERMINATE CONNECTION')
self.caller.closeConnection()
self.initCancelTest()
-
- elif callerHandler == 'NO SIGNAL':
- self.testResult = 300
- logger.logEvent('300 General Handler Error: Caller handler have no signal')
else:
self.testResult = 605
logger.logEvent('605 General Handler Error: caller handler no respond timeout')
@@ -107,18 +100,15 @@ class doTheTest:
# waiting results state
def waitingFeedback(self):
logger.logEvent('Waiting Feedback')
- self.resultDest = self.receiver.receiveData(15)
- self.resultCaller = self.caller.receiveData(15)
- #print 'result '+self.resultCaller+'--'+self.resultDest
- if self.resultCaller <> 'CALL OK':
- if self.resultDest <> 'CALL OK':
- logger.logEvent('Test Failed')
- self.testResult = 486
- self.initTerminate()
- elif self.resultCaller == 'CALL OK' and self.callFrom[0:3] != 'GSM' and self.resultDest <> 'CALL OK' and self.dest == 'GSMExt.Eplus':
- logger.logEvent('Payment required, only Eplus')
- self.testResult = 402
+ self.resultDest = self.receiver.receiveData(20)
+ self.resultCaller = self.caller.receiveData(20)
+ print 'result '+self.resultCaller+'--'+self.resultDest
+ if self.resultCaller <> 'CALL OK' or self.resultDest <> 'CALL OK':
+
+ logger.logEvent('Test Failed')
+ self.testResult = 486
self.initTerminate()
+
else:
logger.logEvent('Test Succeed')
self.testResult = 200
@@ -209,7 +199,7 @@ class doTheTest:
if self.caller.connected == 1:
logger.logEvent('Connected to Caller Handler')
self.caller.sendData('HELLO HANDLER')
- if self.caller.receiveData(25) == 'HELLO CONTROLLER':
+ if self.caller.receiveData(20) == 'HELLO CONTROLLER':
logger.logEvent('Caller Handler respond')
self.connected = 'OK'
else:
@@ -225,7 +215,7 @@ class doTheTest:
if self.receiver.connected == 1:
logger.logEvent('Connected to Receiver Handler')
self.receiver.sendData('HELLO HANDLER')
- if self.receiver.receiveData(25) == 'HELLO CONTROLLER':
+ if self.receiver.receiveData(20) == 'HELLO CONTROLLER':
logger.logEvent('Receiver Handler respond')
self.connected = 'OK'
else: