summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/23-07-2011/classController.py
diff options
context:
space:
mode:
authorMac-Linux2011-07-22 20:53:45 +0200
committerMac-Linux2011-07-22 20:53:45 +0200
commitd3e5b3926a59f9916e8cc5af493f4da27e22e8d5 (patch)
tree15b2eef2fd92ecad6e3793d321101d600dfc3ed5 /For Weekly Test/23-07-2011/classController.py
parentdeleted some old files (diff)
downloadgsm-selftest-d3e5b3926a59f9916e8cc5af493f4da27e22e8d5.tar.gz
gsm-selftest-d3e5b3926a59f9916e8cc5af493f4da27e22e8d5.tar.xz
gsm-selftest-d3e5b3926a59f9916e8cc5af493f4da27e22e8d5.zip
editing file for weekly test.
Diffstat (limited to 'For Weekly Test/23-07-2011/classController.py')
-rw-r--r--For Weekly Test/23-07-2011/classController.py59
1 files changed, 21 insertions, 38 deletions
diff --git a/For Weekly Test/23-07-2011/classController.py b/For Weekly Test/23-07-2011/classController.py
index 698f7db..a2c0b20 100644
--- a/For Weekly Test/23-07-2011/classController.py
+++ b/For Weekly Test/23-07-2011/classController.py
@@ -1,9 +1,6 @@
import sys
import os
-import time
-import MySQLdb
import subprocess
-import signal
import classClient
import classDb
@@ -15,10 +12,6 @@ logger = LogFileClass.Logging('classController.log')
from time import sleep
-
-class TimeoutException(Exception):
- pass
-
class test:
def __init__(self, orig, dest, destNo):
@@ -33,42 +26,39 @@ class test:
self.testResult = None
self.caller = None
self.receiver = None
+ self.add = None
def FuncTest(self):
- def timeout_handler(signum, frame):
- raise TimeoutException()
-
logger.logEvent('')
- logger.logEvent('====================== Preparing Test ======================')
try:
if self.orig =="gsmBox1":
self.portOrig = 50095
+ self.add = ''
elif self.orig =="gsmBox2":
self.portOrig = 50096
+ self.add = ''
elif self.orig =="gsmBox3":
self.portOrig = 50097
+ self.add = ''
else:
- # open SIP caller handler
- self.portOrig = 50099
+ self.portOrig = '50099'
+ self.add = 'localhost'
command="--command=python sipHandler.py " +self.portOrig
subprocess.Popen(args=["gnome-terminal", command])
- sleep(5)
+ sleep(3)
- logger.logEvent('Connecting to Caller handler')
- caller = classClient.Connection('localhost',self.portOrig)
+ caller = classClient.Connection(self.add,self.portOrig)
caller.connect()
message = self.orig+ '|-C'
caller.sendData(message)
-
- # wait respond from origin handler
origHandler = caller.receiveData(60)
@@ -78,22 +68,23 @@ class test:
if self.dest =="gsmBox1":
self.portDest = 50102
+ self.add = ''
if self.dest =="gsmBox2":
self.portDest = 50103
+ self.add = ''
if self.dest =="gsmBox3":
self.portDest = 50103
-
+ self.add = ''
else:
- self.portDest = 50100
+ self.portDest = '50100'
command="--command=python sipHandler.py " +self.portDest
subprocess.Popen(args=["gnome-terminal", command])
- sleep(5)
+ sleep(3)
- logger.logEvent('Connecting to Receiver handler')
receiver = classClient.Connection('localhost', self.portDest)
receiver.connect()
@@ -104,31 +95,24 @@ class test:
if destHandler == "ready":
- logger.logEvent('Receiver handler : Ready')
-
caller.sendData("start|"+self.destNo)
-
- logger.logEvent('------------ Test Result ------------')
- self.resultOrig = caller.receiveData(120)
- self.resultDest = receiver.receiveData(120)
+ self.resultOrig = caller.receiveData(60)
+ self.resultDest = receiver.receiveData(60)
-
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)
- self.resultOrig = caller.receiveData(0)
- self.resultDest = receiver.receiveData(0)
+ self.resultOrig = caller.receiveData(60)
+ self.resultDest = receiver.receiveData(60)
logger.logEvent('2nd Test, Origin :' +self.resultOrig)
logger.logEvent('2nd Test, Destination :' +self.resultDest)
-
- #if still failed, we make automatic test vice versa
if self.resultOrig == 486 or self.resultDest == 486:
self.testResult = 486
@@ -148,8 +132,7 @@ class test:
else:
self.testResult = 604
- logger.logEvent('604 General Handler Error: Destination handler no respond')
- #tell Caller handler to terminate because receiver doesnt work
+ logger.logEvent('604 General Handler Error: Destination handler no respond timeout')
caller.sendData('487')
receiver.closeConnection()
@@ -161,11 +144,11 @@ class test:
caller.closeConnection()
else:
self.testResult = 605
- logger.logEvent('605 General Handler Error: Origin handler no respond time out')
+ logger.logEvent('605 General Handler Error: Origin handler no respond timeout')
caller.closeConnection()
except ValueError:
- testResult = 602
+ self.testResult = 602
logger.logEvent('602 General Handler Error: Could not open Origin handler')