Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed one-hang-bug in cocos-console-test.py

This commit is contained in:
shujunqiao 2014-05-04 17:33:00 +08:00
parent 7fca2c05e2
commit 6d2542efb5
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tools/jenkins-scripts/cocos-console-test.py
View File

@ -11,6 +11,7 @@ import sys
import json import json
import time import time
import socket import socket
import threading
import smtplib import smtplib
from email.mime.text import MIMEText from email.mime.text import MIMEText
from os.path import join, getsize from os.path import join, getsize
@ -176,6 +177,30 @@ def appendToResult(content):
global console_result global console_result
console_result = console_result + content console_result = console_result + content
info_of_close_app = {}
cur_test_name = ''
class myThread(threading.Thread):
def __init__(self,threadname):
threading.Thread.__init__(self,name=threadname)
def run(self):
run_name = self.getName()
print 'run_name:', run_name
if run_name == 'close':
while True:
soc = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
try:
soc.connect(('localhost', PORT))
cmd_close = 'director end\r\n'
print 'cmd close:', cmd_close
soc.send(cmd_close)
time.sleep(2)
global cur_test_name
print 'cur_test_name:', cur_test_name
info_of_close_app[cur_test_name] = True
break
except Exception, e:
time.sleep(5)
# if any error # if any error
ANY_ERROR_IN_RUN = 0 ANY_ERROR_IN_RUN = 0
# excute cocos command # excute cocos command
@ -212,14 +237,14 @@ def cocos_project(level):
if phone == 'android' and getAndroidDevices() == 0: if phone == 'android' and getAndroidDevices() == 0:
strInfo = 'no android device, please checkout the device is running ok.' strInfo = 'no android device, please checkout the device is running ok.'
print strInfo print strInfo
# appendToResult(' '+strInfo+"\n\r\t")
else: else:
info_cmd = os.system(cmd)
print 'info '+COCOS_CMD[level]+':', not info_cmd
if level == ENUM_PARAM.run: if level == ENUM_PARAM.run:
time.sleep(20) global cur_test_name
strClose = close_proj(proj, phone) cur_test_name = proj+','+phone
appendToResult(' '+strClose+"\n\r\t") thread_close = myThread('close')
thread_close.start()
info_cmd = os.system(cmd)
time.sleep(5)
appendToResult(' '+cmd +': ' + str(not info_cmd) + ".\n\r\t") appendToResult(' '+cmd +': ' + str(not info_cmd) + ".\n\r\t")
# build and run according to params of provided.(lv_ignore: e.g:ignore new) # build and run according to params of provided.(lv_ignore: e.g:ignore new)