# 优化项目结构

zmcasey · Jan 31, 2018 · 93b9075 · 93b9075
1 parent d4da8ff
commit 93b9075
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 961 deletions.
diff --git a/run.py b/run.py
@@ -8,15 +8,15 @@
 import click
 import unittest
 from BeautifulReport import BeautifulReport
-from lib import CreateCases
+from src.lib import CreateCases
 
 CREATE_CASES_FILE_STATUS = CreateCases.CreateCase()
 
 
 @click.command()
-@click.option('--cases', default='testcases/', help="case file path")
+@click.option('--cases', default='src/testcases/', help="case file path")
 @click.option('--pattern', default='*.py', help="get cases file pattern")
-@click.option('--report', default='report/', help="generator report in path")
+@click.option('--report', default='src/report/', help="generator report in path")
 def run(cases, pattern, report):
     test_suite = unittest.defaultTestLoader.discover(cases, pattern=pattern)
     result = BeautifulReport(test_suite)

diff --git a/src/__init__.py b/src/__init__.py
@@ -0,0 +1,8 @@
+"""
+@Version: 1.0
+@Project: doraemon
+@Author: Raymond
+@Data: 2018/1/31 下午3:53
+@File: __init__.py.py
+@License: MIT
+"""
diff --git a/cases/test_history_day.json → src/cases/test_history_day.json b/cases/test_history_day.json → src/cases/test_history_day.json
diff --git a/cases/test_juhe_api.json → src/cases/test_juhe_api.json b/cases/test_juhe_api.json → src/cases/test_juhe_api.json
diff --git a/config/__init__.py → src/config/__init__.py b/config/__init__.py → src/config/__init__.py
diff --git a/config/config.py → src/config/config.py b/config/config.py → src/config/config.py
@@ -6,17 +6,17 @@
 """
 import json
 import os
-from lib.LogHandler import LogHandler
-from lib import GetDictParam, CasesManager, CasesContainer
+from ..lib.LogHandler import LogHandler
+from ..lib import GetDictParam, CasesManager, CasesContainer
 
 # PATH
 
 
-CASE_PATH = 'cases/'
-TESTCASES_PATH = 'testcases/'
-REPORT_PATH = 'report/'
-HEADERS_TEMPLATE_PATH = 'template/header.txt'
-CONTENT_TEMPLATE_PATH = 'template/content.txt'
+CASE_PATH = 'src/cases/'
+TESTCASES_PATH = 'src/testcases/'
+REPORT_PATH = 'src/report/'
+HEADERS_TEMPLATE_PATH = 'src/template/header.txt'
+CONTENT_TEMPLATE_PATH = 'src/template/content.txt'
 DEBUG_INFO = 1
 
 

diff --git a/report/测试报告.html → src/report/测试报告.html b/report/测试报告.html → src/report/测试报告.html
@@ -7115,7 +7115,7 @@ <h5>详细数据</h5>
             "className": "TestJuheApi",
             "methodName": "test_get_methods",
             "description": "通过get方法请求聚合微信精选接口.",
-            "spendTime": "0.217 s",
+            "spendTime": "0.456 s",
             "status": "成功",
             "log": [
                 "Response : {'reason': '请求成功'}",
@@ -7127,7 +7127,7 @@ <h5>详细数据</h5>
             "className": "TestJuheApi",
             "methodName": "test_post_methods",
             "description": "通过post方法请求聚合微信精选接口, 并拿到正确的返回结果",
-            "spendTime": "0.2 s",
+            "spendTime": "0.193 s",
             "status": "成功",
             "log": [
                 "Response : {'reason': '请求成功', 'list': ['len', 30], 'error_code': 0}",
@@ -7139,7 +7139,7 @@ <h5>详细数据</h5>
     "testName": "测试deafult报告",
     "testAll": 3,
     "testFail": 0,
-    "beginTime": "2018-01-31 15:31:44",
+    "beginTime": "2018-01-31 15:59:16",
     "totalTime": "1s",
     "testSkip": 0,
     "testError": 0

diff --git a/schema/juhe/test_post_methods.json → src/schema/juhe/test_post_methods.json b/schema/juhe/test_post_methods.json → src/schema/juhe/test_post_methods.json
diff --git a/template/content.txt b/template/content.txt
diff --git a/template/header.txt b/template/header.txt