summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/tricode/trueTableClass.py
diff options
context:
space:
mode:
authorgsmselftest2011-11-02 16:27:02 +0100
committergsmselftest2011-11-02 16:27:02 +0100
commitff7af9232a102ac4b9071dbbc1fddea9d9cdbcb8 (patch)
tree3036f69fe6728e86db0aeeb4ad034d5d38fd74b2 /For Weekly Test/tricode/trueTableClass.py
parentBackup of server handlers with the new self-rebooting code (diff)
downloadgsm-selftest-ff7af9232a102ac4b9071dbbc1fddea9d9cdbcb8.tar.gz
gsm-selftest-ff7af9232a102ac4b9071dbbc1fddea9d9cdbcb8.tar.xz
gsm-selftest-ff7af9232a102ac4b9071dbbc1fddea9d9cdbcb8.zip
fix the bug
Diffstat (limited to 'For Weekly Test/tricode/trueTableClass.py')
-rwxr-xr-xFor Weekly Test/tricode/trueTableClass.py40
1 files changed, 26 insertions, 14 deletions
diff --git a/For Weekly Test/tricode/trueTableClass.py b/For Weekly Test/tricode/trueTableClass.py
index 7c64283..1b50aed 100755
--- a/For Weekly Test/tricode/trueTableClass.py
+++ b/For Weekly Test/tricode/trueTableClass.py
@@ -18,17 +18,14 @@ class trueTable:
def lookingBTSname(self, btsname):
if len(self.nanoBts) == 0:
- found = False
+ self.found = False
else:
found = False
for y in self.nanoBts: #find the existing nanoBts result
name = y[0]
if name == btsName:
- if y[1] == False:
- self.nanoBts.remove(btsName)
- else:
- found = True
- return found
+ self.found = True
+ return self.found
def initTrueTable(self):
global btsName
@@ -38,6 +35,7 @@ class trueTable:
for devLists in deviceLists: #define category of the external devices
device = devLists[0]
+
if device[0:5] == 'GSMEx' or device == 'landline':
externalRZList.append(device) # fetch into the list
self.db.closeDBConn()
@@ -78,8 +76,14 @@ class trueTable:
btsName = 'nanoBts '+str(j)
self.asteriskServer = True #set status of asterik server as working
- if self.lookingBTSname(btsName) != True:
+ self.lookingBTSname(btsName)
+ if self.found != True:
#if doesnt found the nanoBts, add the result to the list, otherwise just ignoring
+ try:
+ self.nanoBts.remove(btsName)
+ except ValueError:
+ message = 'Error'
+
self.nanoBts.append([btsName,True])
if key == call:#
@@ -109,16 +113,24 @@ class trueTable:
if found != True:
self.nanoBts.append([btsName,False])
- elif result == '801' or result == '802':
- self.nanoBts.append([key,result])
-
- if result == '998' and key == dest:
- if self.lookingBTSname(key) != True:
+ elif str(result) == '801' and key == call:
+ self.lookingBTSname(key)
+ if self.found != True:
self.nanoBts.append([key,result])
+ elif str(result) == '802'and key == dest:
+ self.lookingBTSname(key)
+ if self.found != True:
+ self.nanoBts.append([key,result])
+
+ if str(result) == '998' and key == dest:
+ self.lookingBTSname(key)
+ if self.found != True:
+ self.nanoBts.append([key,result])
- if result == '999' and key == call:
- if self.lookingBTSname(key) != True:
+ if str(result) == '999' and key == call:
+ self.lookingBTSname(key)
+ if self.found != True:
self.nanoBts.append([key,result])
j = j+1
elif j == i: