summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/tricode/gsmselftest-website2.py
diff options
context:
space:
mode:
authorTriatmoko2011-10-20 22:28:20 +0200
committerTriatmoko2011-10-20 22:28:20 +0200
commit203ed054bfc1395b5c4db1584b2131a981774511 (patch)
tree0529d1976545133baa287e950d4f650112e4bb75 /For Weekly Test/tricode/gsmselftest-website2.py
parentreport file (diff)
downloadgsm-selftest-203ed054bfc1395b5c4db1584b2131a981774511.tar.gz
gsm-selftest-203ed054bfc1395b5c4db1584b2131a981774511.tar.xz
gsm-selftest-203ed054bfc1395b5c4db1584b2131a981774511.zip
modified the controller
Diffstat (limited to 'For Weekly Test/tricode/gsmselftest-website2.py')
-rwxr-xr-xFor Weekly Test/tricode/gsmselftest-website2.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/For Weekly Test/tricode/gsmselftest-website2.py b/For Weekly Test/tricode/gsmselftest-website2.py
index 2e9ecea..7689e53 100755
--- a/For Weekly Test/tricode/gsmselftest-website2.py
+++ b/For Weekly Test/tricode/gsmselftest-website2.py
@@ -7,7 +7,8 @@ import PingClass
import trueTableClass
import initTestClass
import usbDetectClass
-import ServerClassSoftware
+#import ServerClassSoftware
+import ServerClass
from time import sleep
global resultsList
@@ -97,15 +98,13 @@ def doSipTest():
#destList = ['gsmr1','gsmr2', 'gsmr3', 'landline', 'unisip', 'GSMExt.O2', 'GSMExt.Voda', 'GSMExt.Eplus', 'GSMExt.Tm' ]
destList = ['landline', 'unisip']
- print "test"
doTest = initTestClass.doTest()
- print 'iam here'
for callTo in destList:
callFrom = 'sip'
doTest.initTest(callFrom,callTo)
resultsList.append([callFrom, callTo, doTest.result])
-
+ initTrueTable(resultsList)
def doIncomingTest(): #incoming call to RZ network
destList = ['GSMRZ1','unisip', 'GSMRZ2','GSMRZ3']
@@ -158,7 +157,7 @@ def regularTest():
def sendResultWebsite(message):
if server.sendData(message+ chr(10)) == 1:
print 'data sent successfully'
- test = server.receiveData(2)
+ test = server.receiveData(5)
if test == 'TIMEOUT':
closeFunction(db,server)
@@ -168,7 +167,7 @@ def sendResultWebsite(message):
def sendFinishMessage():
if server.connected == 1:
server.sendData('TEST DONE\n')
- test = server.receiveData(2)
+ test = server.receiveData(5)
if test == 'TIMEOUT':
closeFunction(db,server)
if test == 'DISCONNECT':
@@ -406,7 +405,7 @@ else:
global tried
initDB() # should put db condition
- server = ServerClassSoftware.ServerHandlerSoftware(34500) #define the port
+ server = ServerClass.ServerHandlerSoftware(34500) #define the port
tried = server.openSocket(10)
if tried == 'TIMEOUT':