summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/tricode/ControllerClass.py
diff options
context:
space:
mode:
authorTriatmoko2011-10-29 04:35:04 +0200
committerTriatmoko2011-10-29 04:35:04 +0200
commit1fa3d6172ebcdd241b613447142fa7c982fa65a2 (patch)
treeb5701f2edb81a0f91258558071b7814ed6b21d2f /For Weekly Test/tricode/ControllerClass.py
parentedit result test (diff)
downloadgsm-selftest-1fa3d6172ebcdd241b613447142fa7c982fa65a2.tar.gz
gsm-selftest-1fa3d6172ebcdd241b613447142fa7c982fa65a2.tar.xz
gsm-selftest-1fa3d6172ebcdd241b613447142fa7c982fa65a2.zip
controller bug
Diffstat (limited to 'For Weekly Test/tricode/ControllerClass.py')
-rwxr-xr-xFor Weekly Test/tricode/ControllerClass.py77
1 files changed, 18 insertions, 59 deletions
diff --git a/For Weekly Test/tricode/ControllerClass.py b/For Weekly Test/tricode/ControllerClass.py
index b376c46..6e1de89 100755
--- a/For Weekly Test/tricode/ControllerClass.py
+++ b/For Weekly Test/tricode/ControllerClass.py
@@ -35,7 +35,7 @@ class doTheTest:
self.initCaller()
if self.callFrom =="GSMRZ3" or self.callFrom =="GSMRZ2": # wait until ssh connection establish
- sleep(6)
+ sleep(5)
else:
sleep(2)
self.callerGreeting()
@@ -43,14 +43,14 @@ class doTheTest:
if self.connected == 'OK':
self.caller.sendData('CALLER|'+self.destNo)
- callerHandler = self.caller.receiveData(20)
+ callerHandler = self.caller.receiveData(10)
if callerHandler == "CALLER READY":
logger.logEvent('Caller handler : Ready')
self.initReceiver()
if self.dest =="GSMRZ3" or self.dest =="GSMRZ2": # wait until ssh connection establish
- sleep(6)
+ sleep(5)
else:
sleep(2)
self.receiverGreeting()
@@ -58,7 +58,7 @@ class doTheTest:
if self.connected == 'OK':
self.receiver.sendData('RECEIVER')
- destHandler = self.receiver.receiveData(20)
+ destHandler = self.receiver.receiveData(10)
if destHandler == 'RECEIVER READY':
logger.logEvent('Receiver handler : Ready')
@@ -66,19 +66,12 @@ class doTheTest:
self.startCall()
self.waitingFeedback()
- elif destHandler == 'DEVICE NOT WORK':
- self.testResult == 802
- logger.logEvent('802 General Device Error: Destination device no respond timeout')
- self.initTerminate()
else:
self.testResult = 604
logger.logEvent('604 General Handler Error: Destination handler no respond timeout')
- self.initTerminate()
-
- elif self.connected == 'DEVICE NOT WORK':
- self.testResult == 802
- logger.logEvent('802 General Device Error: Destination device no respond timeout')
- self.initTerminate()
+ self.caller.sendData('TERMINATE CONNECTION')
+ self.receiver.closeConnection()
+
else:
logger.logEvent('998 General Handler Error: Could not connect Destination handler')
self.testResult = 998
@@ -92,13 +85,6 @@ class doTheTest:
self.caller.sendData('TERMINATE CONNECTION')
self.caller.closeConnection()
self.initCancelTest()
-
- elif self.connected == 'DEVICE NOT WORK':
- self.testResult = 801
- self.caller.sendData('TERMINATE CONNECTION')
- self.caller.closeConnection()
- logger.logEvent('802 General Device Error: Caller device no respond timeout')
- self.initCancelTest()
else:
self.testResult = 999
logger.logEvent('999 General Handler Error: Could not connect to Caller handler')
@@ -114,37 +100,19 @@ class doTheTest:
# waiting results state
def waitingFeedback(self):
logger.logEvent('Waiting Feedback')
- self.resultDest = self.receiver.receiveData(20)
- self.resultCaller = self.caller.receiveData(20)
- #print 'result '+self.resultCaller+'--'+self.resultDest 'DEVICE NOT WORK'
- if self.resultCaller == 'DEVICE NOT WORK':
- logger.logEvent('Caller device not work')
- self.testResult = 801
- self.initTerminate()
+ self.resultDest = self.receiver.receiveData(15)
+ self.resultCaller = self.caller.receiveData(15)
+ #print 'result '+self.resultCaller+'--'+self.resultDest
+ if self.resultCaller <> 'CALL OK' or self.resultDest <> 'CALL OK':
- elif self.resultCaller == 'CALL OK' and self.resultDest =='CALL OK':
+ logger.logEvent('Test Failed')
+ self.testResult = 486
+ self.initTerminate()
+
+ else:
logger.logEvent('Test Succeed')
self.testResult = 200
self.initTerminate()
- else:
- if self.dest == 'GSMExt.Eplus':
- if self.resultCaller == 'CALL OK' and self.resultDest <> 'CALL OK':
- logger.logEvent('Test Failed - Eplus No credit on Eplus')
- self.testResult = 402
- self.initTerminate()
- else:
- logger.logEvent('Test Failed')
- self.testResult = 486
- self.initTerminate()
-
- else:
- if self.resultCaller <> 'CALL OK' or self.resultDest <> 'CALL OK':
-
- logger.logEvent('Test Failed')
- self.testResult = 486
- self.initTerminate()
-
-
#send start call message to caller
def startCall(self):
@@ -231,13 +199,9 @@ class doTheTest:
if self.caller.connected == 1:
logger.logEvent('Connected to Caller Handler')
self.caller.sendData('HELLO HANDLER')
- message = self.caller.receiveData(20)
- if message == 'HELLO CONTROLLER':
+ if self.caller.receiveData(30) == 'HELLO CONTROLLER':
logger.logEvent('Caller Handler respond')
self.connected = 'OK'
- else:
- logger.logEvent('Connect to Caller but device doesnt work')
- self.connected = 'DEVICE NOT WORK'
else:
logger.logEvent('Cannt connect to Caller')
self.connected = 'NOT OK'
@@ -251,14 +215,9 @@ class doTheTest:
if self.receiver.connected == 1:
logger.logEvent('Connected to Receiver Handler')
self.receiver.sendData('HELLO HANDLER')
- message = self.receiver.receiveData(20)
- if message == 'HELLO CONTROLLER':
+ if self.receiver.receiveData(30) == 'HELLO CONTROLLER':
logger.logEvent('Receiver Handler respond')
self.connected = 'OK'
-
- else:
- logger.logEvent('connect to Receiver but device doesnt work')
- self.connected = 'DEVICE NOT WORK'
else:
logger.logEvent('Cannt connect to Receiver')
self.connected = 'NOT OK'