Commit 149f4434 by zhaihuitao

update

parent 7d349196
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment="update"> <list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment="update">
<change beforePath="$PROJECT_DIR$/testcase/game/game_event.py" beforeDir="false" afterPath="$PROJECT_DIR$/testcase/game/game_event.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/testcase/game/game_event.py" beforeDir="false" afterPath="$PROJECT_DIR$/testcase/game/game_event.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcase/run_all_cases.py" beforeDir="false" afterPath="$PROJECT_DIR$/testcase/run_all_cases.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -443,13 +444,6 @@ ...@@ -443,13 +444,6 @@
<updated>1596505503233</updated> <updated>1596505503233</updated>
<workItem from="1596786333197" duration="228000" /> <workItem from="1596786333197" duration="228000" />
</task> </task>
<task id="LOCAL-00035" summary="add adshow enevt">
<created>1598066542919</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1598066542919</updated>
</task>
<task id="LOCAL-00036" summary="update"> <task id="LOCAL-00036" summary="update">
<created>1598259165042</created> <created>1598259165042</created>
<option name="number" value="00036" /> <option name="number" value="00036" />
...@@ -786,7 +780,14 @@ ...@@ -786,7 +780,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1608118605393</updated> <updated>1608118605393</updated>
</task> </task>
<option name="localTasksCounter" value="84" /> <task id="LOCAL-00084" summary="update">
<created>1608118787886</created>
<option name="number" value="00084" />
<option name="presentableId" value="LOCAL-00084" />
<option name="project" value="LOCAL" />
<updated>1608118787886</updated>
</task>
<option name="localTasksCounter" value="85" />
<servers /> <servers />
</component> </component>
<component name="TodoView"> <component name="TodoView">
...@@ -854,10 +855,10 @@ ...@@ -854,10 +855,10 @@
</state> </state>
<state x="149" y="25" width="982" height="728" key="SettingsEditor/0.0.1280.800@0.0.1280.800" timestamp="1608117997488" /> <state x="149" y="25" width="982" height="728" key="SettingsEditor/0.0.1280.800@0.0.1280.800" timestamp="1608117997488" />
<state x="149" y="25" width="982" height="716" key="SettingsEditor/0.25.1280.716@0.25.1280.716" timestamp="1606734406260" /> <state x="149" y="25" width="982" height="716" key="SettingsEditor/0.25.1280.716@0.25.1280.716" timestamp="1606734406260" />
<state x="240" y="106" key="Vcs.Push.Dialog.v2" timestamp="1608118607305"> <state x="240" y="106" key="Vcs.Push.Dialog.v2" timestamp="1608118815830">
<screen x="0" y="0" width="1280" height="800" /> <screen x="0" y="0" width="1280" height="800" />
</state> </state>
<state x="240" y="106" key="Vcs.Push.Dialog.v2/0.0.1280.800@0.0.1280.800" timestamp="1608118607305" /> <state x="240" y="106" key="Vcs.Push.Dialog.v2/0.0.1280.800@0.0.1280.800" timestamp="1608118815830" />
<state x="240" y="120" key="Vcs.Push.Dialog.v2/0.25.1280.716@0.25.1280.716" timestamp="1606734542701" /> <state x="240" y="120" key="Vcs.Push.Dialog.v2/0.25.1280.716@0.25.1280.716" timestamp="1606734542701" />
</component> </component>
</project> </project>
\ No newline at end of file
import struct
import socket
import random
import time
import json
import os import os
import sys import sys
import importlib
importlib.reload(sys)
import time
import json
from testcase.game.game_param import allevent from testcase.game.game_param import allevent
......
...@@ -20,6 +20,7 @@ json.dump({"imei": IMEI}, open('imei.json', 'w+'), sort_keys=True, indent=4) ...@@ -20,6 +20,7 @@ json.dump({"imei": IMEI}, open('imei.json', 'w+'), sort_keys=True, indent=4)
print(IMEI) print(IMEI)
"""解决在Jenkins控制台无法打印中文的问题""" """解决在Jenkins控制台无法打印中文的问题"""
os.environ['NLS_LANG'] = 'Simplified Chinese_CHINA.ZHS16GBK' os.environ['NLS_LANG'] = 'Simplified Chinese_CHINA.ZHS16GBK'
...@@ -29,12 +30,14 @@ curPath = os.path.abspath(os.path.dirname(__file__)) ...@@ -29,12 +30,14 @@ curPath = os.path.abspath(os.path.dirname(__file__))
rootPath = os.path.split(curPath)[0] rootPath = os.path.split(curPath)[0]
sys.path.append(rootPath) sys.path.append(rootPath)
"""添加用例地址""" """添加用例地址"""
case_path = os.path.join(os.getcwd()) case_path = os.path.join(os.getcwd())
report_path = r"/Users/zhaihuitao/PycharmProjects/TKIO/interfaceTest/report/result.html" report_path = r"/Users/zhaihuitao/PycharmProjects/TKIO/interfaceTest/report/result.html"
def all_case(): '''def all_case():
discover = unittest.defaultTestLoader.discover(case_path, "test*.py") discover = unittest.defaultTestLoader.discover(case_path, "test*.py")
print(discover) print(discover)
return discover return discover
...@@ -50,7 +53,7 @@ if __name__ == "__main__": ...@@ -50,7 +53,7 @@ if __name__ == "__main__":
runner.run(all_case()) runner.run(all_case())
"""在控制台打印日志""" """在控制台打印日志"""
unittest.TextTestRunner(verbosity=0).run(all_case()) unittest.TextTestRunner(verbosity=0).run(all_case())
fp.close() fp.close()'''
'''if __name__ == "__main__": '''if __name__ == "__main__":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment