summaryrefslogtreecommitdiffstats
path: root/For Weekly Test
diff options
context:
space:
mode:
authorMac-Linux2011-07-22 16:20:50 +0200
committerMac-Linux2011-07-22 16:20:50 +0200
commit2e331262b0f83b4be765af5b5cced0132dd02457 (patch)
treee29736dd100a83ff5ace9b0539411119f7baa740 /For Weekly Test
parentfix else if condition. (diff)
downloadgsm-selftest-2e331262b0f83b4be765af5b5cced0132dd02457.tar.gz
gsm-selftest-2e331262b0f83b4be765af5b5cced0132dd02457.tar.xz
gsm-selftest-2e331262b0f83b4be765af5b5cced0132dd02457.zip
fix timeout for the controller test.
Diffstat (limited to 'For Weekly Test')
-rw-r--r--For Weekly Test/23-07-2011/classController.py105
1 files changed, 27 insertions, 78 deletions
diff --git a/For Weekly Test/23-07-2011/classController.py b/For Weekly Test/23-07-2011/classController.py
index b48dbc8..698f7db 100644
--- a/For Weekly Test/23-07-2011/classController.py
+++ b/For Weekly Test/23-07-2011/classController.py
@@ -44,16 +44,14 @@ class test:
try:
- if self.orig =="gsmBox1" or self.orig =="gsmBox2" or self.orig =="gsmBox3:
+ if self.orig =="gsmBox1":
+ self.portOrig = 50095
- if self.orig =="gsmBox1":
- self.portOrig = 50095
+ elif self.orig =="gsmBox2":
+ self.portOrig = 50096
- if self.orig =="gsmBox2":
- self.portOrig = 50096
-
- if self.orig =="gsmBox3":
- self.portOrig = 50097
+ elif self.orig =="gsmBox3":
+ self.portOrig = 50097
else:
# open SIP caller handler
@@ -71,33 +69,21 @@ class test:
caller.sendData(message)
# wait respond from origin handler
- signal.signal(signal.SIGALRM, timeout_handler)
- signal.alarm(60)
-
- while 1:
- try:
- origHandler = caller.receiveData(0)
- if origHandler <> "":
- break
-
- except TimeoutException:
- origHandler = "failed"
- break
-
+ origHandler = caller.receiveData(60)
+
if origHandler == "ready":
logger.logEvent('Caller handler : Ready')
try:
- if self.dest =="gsmBox1" or self.dest =="gsmBox2" or self.dest =="gsmBox2":
- if self.dest =="gsmBox1":
- self.portDest = 50102
+ if self.dest =="gsmBox1":
+ self.portDest = 50102
- if self.dest =="gsmBox2":
- self.portDest = 50103
+ if self.dest =="gsmBox2":
+ self.portDest = 50103
- if self.dest =="gsmBox3":
- self.portDest = 50103
+ if self.dest =="gsmBox3":
+ self.portDest = 50103
else:
@@ -114,18 +100,7 @@ class test:
message = self.dest+ '|-R'
receiver.sendData(message)
- signal.signal(signal.SIGALRM, timeout_handler)
- signal.alarm(60)
-
- while 1:
- try:
- destHandler = receiver.receiveData(0)
- if destHandler <> "":
- break
-
- except TimeoutException:
- destHandler = "failed"
- break
+ destHandler = receiver.receiveData(0)
if destHandler == "ready":
@@ -133,51 +108,25 @@ class test:
caller.sendData("start|"+self.destNo)
-
- signal.signal(signal.SIGALRM, timeout_handler)
- signal.alarm(120)
-
logger.logEvent('------------ Test Result ------------')
- while 1:
- try:
- sleep(0.5)
- self.resultOrig = caller.receiveData(0)
- self.resultDest = receiver.receiveData(0)
-
- if self.resultOrig <> "" and self.resultDest <> "":
- logger.logEvent('1st Test, Origin :' +self.resultOrig)
- logger.logEvent('1st Test, Destination :' +self.resultDest)
- break
-
- except TimeoutException:
- self.resultOrig = 486
- self.resultDest = 486
- break
+ self.resultOrig = caller.receiveData(120)
+ self.resultDest = receiver.receiveData(120)
+
+ logger.logEvent('1st Test, Origin :' +self.resultOrig)
+ logger.logEvent('1st Test, Destination :' +self.resultDest)
+
#if failed, tell everybody to try one more time
if self.resultOrig == 486 or self.resultDest == 486:
caller.sendData("start|"+self.destNo)
- signal.signal(signal.SIGALRM, timeout_handler)
- signal.alarm(120)
-
- while 1:
- try:
- sleep(0.5)
- self.resultOrig = caller.receiveData(0)
- self.resultDest = receiver.receiveData(0)
-
- if self.resultOrig <> "" and self.resultDest <> "":
- logger.logEvent('2nd Test, Origin :' +self.resultOrig)
- logger.logEvent('2nd Test, Destination :' +self.resultDest)
- break
-
- except TimeoutException:
- self.resultOrig = 486
- self.resultDest = 486
- break
+ self.resultOrig = caller.receiveData(0)
+ self.resultDest = receiver.receiveData(0)
+
+ logger.logEvent('2nd Test, Origin :' +self.resultOrig)
+ logger.logEvent('2nd Test, Destination :' +self.resultDest)
#if still failed, we make automatic test vice versa
@@ -212,7 +161,7 @@ class test:
caller.closeConnection()
else:
self.testResult = 605
- logger.logEvent('605 General Handler Error: Origin handler no respond')
+ logger.logEvent('605 General Handler Error: Origin handler no respond time out')
caller.closeConnection()