summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/Advance/ControllerClass.py
diff options
context:
space:
mode:
authorgsmselftest2011-10-18 20:04:06 +0200
committergsmselftest2011-10-18 20:04:06 +0200
commitd1a2d93f2a60af4f6db6041934814e1af27eb027 (patch)
tree0921aa781487de69e6c2eca03229df05dde219b3 /For Weekly Test/Advance/ControllerClass.py
parentMerge branch 'master' of lab.ks.uni-freiburg.de:lsfks/projekte/gsm-selftest (diff)
downloadgsm-selftest-d1a2d93f2a60af4f6db6041934814e1af27eb027.tar.gz
gsm-selftest-d1a2d93f2a60af4f6db6041934814e1af27eb027.tar.xz
gsm-selftest-d1a2d93f2a60af4f6db6041934814e1af27eb027.zip
fix the error
Diffstat (limited to 'For Weekly Test/Advance/ControllerClass.py')
-rwxr-xr-xFor Weekly Test/Advance/ControllerClass.py41
1 files changed, 22 insertions, 19 deletions
diff --git a/For Weekly Test/Advance/ControllerClass.py b/For Weekly Test/Advance/ControllerClass.py
index cf32e19..4fddaa4 100755
--- a/For Weekly Test/Advance/ControllerClass.py
+++ b/For Weekly Test/Advance/ControllerClass.py
@@ -27,16 +27,17 @@ class doTheTest:
self.resultCaller = None
self.resultDest = None
self.testResult = None
- self.boxCaller = None
- self.boxDest = None
def FuncTest(self):
logger.logEvent('')
self.initCaller()
- sleep(2)
-
+
+ if self.callFrom =="GSMRZ3":
+ sleep(20)
+ else:
+ sleep(2)
self.callerGreeting()
if self.connected == 'OK':
@@ -47,8 +48,11 @@ class doTheTest:
if callerHandler == "CALLER READY":
logger.logEvent('Caller handler : Ready')
- self.initReceiver()
- sleep(2)
+ self.initReceiver()
+ if self.dest =="GSMRZ3":
+ sleep(20)
+ else:
+ sleep(2)
self.receiverGreeting()
if self.connected == 'OK':
@@ -76,7 +80,8 @@ class doTheTest:
else:
self.testResult = 605
logger.logEvent('605 General Handler Error: caller handler no respond timeout')
-
+
+ self.caller.sendData('TERMINATE CONNECTION')
self.caller.closeConnection()
else:
@@ -88,7 +93,6 @@ class doTheTest:
def waitingFeedback(self):
logger.logEvent('Waiting Feedback')
self.resultDest = self.receiver.receiveData(15)
- sleep(1)
self.resultCaller = self.caller.receiveData(15)
if self.resultCaller <> 'CALL OK' and self.resultDest <> 'CALL OK':
@@ -131,6 +135,7 @@ class doTheTest:
self.boxCaller = SSHTunnelBoxClass.SSHTunneling(self.portCaller, 50008, self.server, self.username, self.password)
self.boxCaller.startTunneling()
+
elif self.callFrom[0:4] == 'GSME':
self.initGSM(self.portCaller, self.callPortName, self.callFrom)
@@ -160,19 +165,17 @@ class doTheTest:
def initTerminate(self):
self.caller.sendData('TERMINATE CONNECTION')
self.receiver.sendData('TERMINATE CONNECTION')
- if self.callFrom[0:5] == 'GSMRZ':
- if self.callFrom == 'GSMRZ1':
- self.caller.closeConnection()
- else:
+ if self.callFrom[0:5] == 'GSMRZ' or self.dest[0:5] == 'GSMRZ':
+ if self.callFrom != 'GSMRZ1':
self.boxCaller.killTunneling()
- if self.dest[0:5] == 'GSMRZ':
- if self.dest == 'GSMRZ1':
- self.receiver.closeConnection()
- else:
+ if self.dest != 'GSMRZ1':
self.boxDest.killTunneling()
- if self.callFrom[0:5] != 'GSMRZ' or self.dest[0:5] != 'GSMRZ':
+ else:
self.receiver.closeConnection()
self.caller.closeConnection()
+ if self.callFrom[0:5] != 'GSMRZ' or self.dest[0:5] != 'GSMRZ':
+ self.receiver.closeConnection()
+ self.caller.closeConnection()
def callerGreeting(self):
self.connected = None
@@ -182,7 +185,7 @@ class doTheTest:
if self.caller.connected == 1:
logger.logEvent('Connected to Caller Handler')
self.caller.sendData('HELLO HANDLER')
- if self.caller.receiveData(10) == 'HELLO CONTROLLER':
+ if self.caller.receiveData(30) == 'HELLO CONTROLLER':
logger.logEvent('Caller Handler respond')
self.connected = 'OK'
else:
@@ -197,7 +200,7 @@ class doTheTest:
if self.receiver.connected == 1:
logger.logEvent('Connected to Receiver Handler')
self.receiver.sendData('HELLO HANDLER')
- if self.receiver.receiveData(10) == 'HELLO CONTROLLER':
+ if self.receiver.receiveData(30) == 'HELLO CONTROLLER':
logger.logEvent('Receiver Handler respond')
self.connected = 'OK'
else: