summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/Advance/initTestClass.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/initTestClass.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/initTestClass.py')
-rwxr-xr-xFor Weekly Test/Advance/initTestClass.py53
1 files changed, 13 insertions, 40 deletions
diff --git a/For Weekly Test/Advance/initTestClass.py b/For Weekly Test/Advance/initTestClass.py
index 7f75be7..e93c839 100755
--- a/For Weekly Test/Advance/initTestClass.py
+++ b/For Weekly Test/Advance/initTestClass.py
@@ -9,32 +9,6 @@ from time import sleep
class doTest:
- def ping(self,handler): # function to check connection to the device
-
-
-
- if handler == 'landline':
- server = PingClass.Ping('sipgate.de')
- self.serverStatus = server.ping(2)
-
- elif handler == 'sip':
- server = PingClass.Ping('132.230.4.8')
- self.serverStatus = server.ping(2)
-
- elif handler == 'unisip':
- server = PingClass.Ping('132.230.252.228')
- self.serverStatus = server.ping(2)
-
- elif handler == 'GSMRZ3':
- server = PingClass.Ping('localhost')
- self.serverStatus = server.ping(2)
-
- elif handler == 'GSMRZ2':
- server = PingClass.Ping('10.4.58.241')
- self.serverStatus = server.ping(2)
- else:
- self.serverStatus = 1
-
def pings(self,IP):
self.serverStatus = None
server = PingClass.Ping(IP)
@@ -91,16 +65,10 @@ class doTest:
caller = self.db.deviceAddress(str(callFrom))
self.pings(dest[4])
- #self.ping(callFrom) # check connection to the device,
if self.serverStatus <> 0:
- #self.ping(callTo)
self.pings(caller[4])
if self.serverStatus <> 0:
-
- #fetch device account detail from database
- #dest = self.db.deviceAddress(str(callTo))
- #caller = self.db.deviceAddress(str(callFrom))
self.initaccount(caller,callFrom)
if self.status == 1:
@@ -176,7 +144,7 @@ class doTest:
gsmRZList.remove(callTo)
destList.remove(callTo)
- self.smartResultList.append(['unisip', callTo, self.result])
+ self.smartResultList.append(['unisip', callTo, self.result, 1])
for callFrom in gsmRZList:
@@ -194,7 +162,7 @@ class doTest:
destList.remove(callTo)
destList.remove(callFrom)
gsmRZList.remove(callFrom)
- self.smartResultList.append([callFrom, callTo, self.result])
+ self.smartResultList.append([callFrom, callTo, self.result,1])
# test incoming call from outside rz network to gsm rz
i = random.randint(0, len(gsmRZList)-1) #
@@ -204,25 +172,30 @@ class doTest:
if self.isThere(callTo,destList) == 1: # Checking whether caller at gsmrz list in the destination list, if yes delete it.
destList.remove(callTo)
- self.smartResultList.append(['landline', callTo, self.result])
+ self.smartResultList.append(['landline', callTo, self.result,1])
for callTo in destList:
callFrom = 'sip'
self.initTest(callFrom,callTo)
- self.smartResultList.append([callFrom, callTo, self.result])
+ self.smartResultList.append([callFrom, callTo, self.result,1])
#retry to call in success test to make sure tests are valid
for dest in self.smartResultList:
- if int(dest[2]) == 486:
+ if int(dest[2]) == 486 and int(dest[3]) != 2:
+ self.initTest('sip', dest[1])
+ self.smartResultList.append([dest[0], dest[1], self.result,2])
+ rem.append(dest)
+
+ if int(dest[2]) == 999 and int(dest[3]) != 2:
self.initTest('sip', dest[1])
- self.smartResultList.append(['sip', dest[1], self.result])
+ self.smartResultList.append(['sip', dest[1], self.result,2])
rem.append(dest)
caller = dest[0] # to test nanobts if the test come from RZ GSM but fehler
- if caller[0:5] == 'GSMRZ':
+ if caller[0:5] == 'GSMRZ' and int(dest[3]) != 2:
if int(dest[2]) == 486:
self.initTest('sip', dest[0])
- self.smartResultList.append(['sip', dest[1], self.result])
+ self.smartResultList.append([dest[0], dest[1], self.result,2])
rem.append(dest)
for remov in rem: