From 59025f0225d5911eef8a0bb9358c91132909c2fc Mon Sep 17 00:00:00 2001 From: zhaihuitao <zhaihuitao@reyun.com> Date: Fri, 15 Jan 2021 17:50:45 +0800 Subject: [PATCH] update --- .idea/workspace.xml | 3 ++- testcase/run_all_cases.py | 11 +++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 47bfaec..4876a4e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -21,6 +21,7 @@ <component name="ChangeListManager"> <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/run_all_cases.py" beforeDir="false" afterPath="$PROJECT_DIR$/testcase/run_all_cases.py" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -414,11 +415,11 @@ <method v="2" /> </configuration> <list> + <item itemvalue="Python.game_event" /> <item itemvalue="Python.params" /> <item itemvalue="Python.run_all_cases" /> <item itemvalue="Python tests.Nosetests for testcase.android_events._adclick.adclickTestCase.testadclick" /> <item itemvalue="Python tests.Nosetests for testcase.android_events._adshow.adshowTestCase.testadshow" /> - <item itemvalue="Python.game_event" /> </list> <recent_temporary> <list> diff --git a/testcase/run_all_cases.py b/testcase/run_all_cases.py index ec303f6..546f42f 100644 --- a/testcase/run_all_cases.py +++ b/testcase/run_all_cases.py @@ -15,12 +15,6 @@ importlib.reload(sys) import json -IMEI = json.load(open('imei.json', 'r+'))['imei'] + 1 -json.dump({"imei": IMEI}, open('imei.json', 'w+'), sort_keys=True, indent=4) -print(IMEI) - - - """解决在Jenkins控制台无法打印中文的问题""" os.environ['NLS_LANG'] = 'Simplified Chinese_CHINA.ZHS16GBK' @@ -36,11 +30,12 @@ case_path = os.path.join(os.getcwd()) 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") print(discover) return discover + if __name__ == "__main__": fp = open(report_path, 'wb') runner = HTMLTestReportCN.HTMLTestRunner( @@ -52,7 +47,7 @@ if __name__ == "__main__": runner.run(all_case()) """在控制台打印日志""" unittest.TextTestRunner(verbosity=0).run(all_case()) - fp.close()''' + fp.close() '''if __name__ == "__main__": -- libgit2 0.27.1