summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/tricode/ControllerClass.py
diff options
context:
space:
mode:
authorTriatmoko2011-10-29 04:36:28 +0200
committerTriatmoko2011-10-29 04:36:28 +0200
commitdbba1e5a5a86f472ec7e58c7096412b40ae84b60 (patch)
tree6a75f53fd1dafab7f1ab390624eba777cb6ccba7 /For Weekly Test/tricode/ControllerClass.py
parentcontroller bug (diff)
downloadgsm-selftest-dbba1e5a5a86f472ec7e58c7096412b40ae84b60.tar.gz
gsm-selftest-dbba1e5a5a86f472ec7e58c7096412b40ae84b60.tar.xz
gsm-selftest-dbba1e5a5a86f472ec7e58c7096412b40ae84b60.zip
modified controller
Diffstat (limited to 'For Weekly Test/tricode/ControllerClass.py')
-rwxr-xr-xFor Weekly Test/tricode/ControllerClass.py76
1 files changed, 56 insertions, 20 deletions
diff --git a/For Weekly Test/tricode/ControllerClass.py b/For Weekly Test/tricode/ControllerClass.py
index 6e1de89..85f29ad 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(5)
+ sleep(6)
else:
sleep(2)
self.callerGreeting()
@@ -43,14 +43,13 @@ 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')
-
self.initReceiver()
if self.dest =="GSMRZ3" or self.dest =="GSMRZ2": # wait until ssh connection establish
- sleep(5)
+ sleep(6)
else:
sleep(2)
self.receiverGreeting()
@@ -58,21 +57,27 @@ 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 == '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.caller.sendData('TERMINATE CONNECTION')
- self.receiver.closeConnection()
-
- else:
+ self.initTerminate()
+
+ elif self.connected == 'DEVICE NOT WORK':
+ self.testResult == 802
+ logger.logEvent('802 General Device Error: Destination device no respond timeout')
+ self.initTerminate()
+ else:
logger.logEvent('998 General Handler Error: Could not connect Destination handler')
self.testResult = 998
self.caller.sendData('TERMINATE CONNECTION')
@@ -85,6 +90,13 @@ 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')
@@ -100,20 +112,35 @@ class doTheTest:
# waiting results state
def waitingFeedback(self):
logger.logEvent('Waiting Feedback')
- self.resultDest = self.receiver.receiveData(15)
- self.resultCaller = self.caller.receiveData(15)
+ 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
+ if self.resultCaller == 'DEVICE NOT WORK':
+ logger.logEvent('Caller device not work')
+ self.testResult = 801
self.initTerminate()
-
- else:
+
+ elif self.resultCaller == 'CALL OK' and self.resultDest =='CALL OK':
logger.logEvent('Test Succeed')
self.testResult = 200
self.initTerminate()
+ else:
+ if self.dest == 'GSMExt.Eplus':
+ if self.resultCaller == 'CALL OK' and self.resultDest == 'TIME OUT':
+ 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):
logger.logEvent('Start Call')
@@ -199,9 +226,13 @@ class doTheTest:
if self.caller.connected == 1:
logger.logEvent('Connected to Caller Handler')
self.caller.sendData('HELLO HANDLER')
- if self.caller.receiveData(30) == 'HELLO CONTROLLER':
+ message = self.caller.receiveData(20)
+ if message == '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'
@@ -215,9 +246,14 @@ class doTheTest:
if self.receiver.connected == 1:
logger.logEvent('Connected to Receiver Handler')
self.receiver.sendData('HELLO HANDLER')
- if self.receiver.receiveData(30) == 'HELLO CONTROLLER':
+ message = self.receiver.receiveData(20)
+ if message == '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'