summaryrefslogtreecommitdiffstats
path: root/For Weekly Test
diff options
context:
space:
mode:
authorTriatmoko2011-10-27 00:44:45 +0200
committerTriatmoko2011-10-27 00:44:45 +0200
commit2811bea51c7f3eb270743473d3c8b2b3b9d03daf (patch)
treeeb2f9d0e27e2aadb933085693a2d8b2beb869dbf /For Weekly Test
parenttimeout devconf (diff)
downloadgsm-selftest-2811bea51c7f3eb270743473d3c8b2b3b9d03daf.tar.gz
gsm-selftest-2811bea51c7f3eb270743473d3c8b2b3b9d03daf.tar.xz
gsm-selftest-2811bea51c7f3eb270743473d3c8b2b3b9d03daf.zip
add no signal error.
Diffstat (limited to 'For Weekly Test')
-rwxr-xr-xFor Weekly Test/tricode/ControllerClass.py9
-rwxr-xr-xFor Weekly Test/tricode/GSMHandler.py33
2 files changed, 28 insertions, 14 deletions
diff --git a/For Weekly Test/tricode/ControllerClass.py b/For Weekly Test/tricode/ControllerClass.py
index 6831d68..42c5f91 100755
--- a/For Weekly Test/tricode/ControllerClass.py
+++ b/For Weekly Test/tricode/ControllerClass.py
@@ -65,7 +65,10 @@ class doTheTest:
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')
@@ -78,6 +81,10 @@ 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')
diff --git a/For Weekly Test/tricode/GSMHandler.py b/For Weekly Test/tricode/GSMHandler.py
index 70d4cc4..f985611 100755
--- a/For Weekly Test/tricode/GSMHandler.py
+++ b/For Weekly Test/tricode/GSMHandler.py
@@ -98,11 +98,15 @@ def receiveMessage(timeout):
logger.logEvent('$talk initialization not sent: ' + str(outcome))
elif message == 'RECEIVER' and lastState == 1:
- outcome = initReceiver()
- if outcome == 1:
- logger.logEvent('RECEIVER READY SENT')
- else:
- logger.logEvent('$receiver ready not sent: ' + str(outcome))
+ signalQua = gsmDevice.getSignalQuality()##
+ if signalQua == 1:##
+ outcome = initReceiver()
+ if outcome == 1:
+ logger.logEvent('RECEIVER READY SENT')
+ else:
+ logger.logEvent('$receiver ready not sent: ' + str(outcome))
+ else:##
+ handlerSocket.sendData('NO SIGNAL') ##
elif message == 'RECEIVE START' and lastState == 2:
outcome = receiveStart()
@@ -112,14 +116,17 @@ def receiveMessage(timeout):
logger.logEvent('$receive status not reported: ' + str(outcome))
elif message[0:6] == 'CALLER' and lastState == 1:
- outcome = initCaller()
-
- global numberToCall
- numberToCall = message[7:]
- if outcome == 1:
- logger.logEvent('CALLER READY SENT')
- else:
- logger.logEvent('$caller ready not sent: ' + str(outcome))
+ signalQua = gsmDevice.getSignalQuality()##
+ if signalQua == 1:##
+ outcome = initCaller()
+ global numberToCall
+ numberToCall = message[7:]
+ if outcome == 1:
+ logger.logEvent('CALLER READY SENT')
+ else:
+ logger.logEvent('$caller ready not sent: ' + str(outcome))
+ else:##
+ handlerSocket.sendData('NO SIGNAL') ##
elif message == 'CALL START' and lastState == 4:
outcome = callStart(numberToCall)