From 203ed054bfc1395b5c4db1584b2131a981774511 Mon Sep 17 00:00:00 2001 From: Triatmoko Date: Thu, 20 Oct 2011 22:28:20 +0200 Subject: modified the controller --- For Weekly Test/tricode/gsmselftest-website2.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'For Weekly Test/tricode/gsmselftest-website2.py') 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': -- cgit v1.2.3-55-g7522