Merge pull request #238 from lihuacai168/fix-ci-redis-cli-error

feat: improve test coverage and remove unused files

Author: lihuacai168

.coverage

@@ -7,6 +7,9 @@
     "ghcr.io/devcontainers/features/github-cli:1": {
       "installDirectlyFromGitHubRelease": true,
       "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/sshd:1": {
+      "version": "latest"
     }
   },
   "postCreateCommand": "bash .devcontainer/setup.sh",

.devcontainer/devcontainer.json

@@ -21,7 +21,6 @@
 from rest_framework.routers import DefaultRouter
 from rest_framework_jwt.views import obtain_jwt_token
 
-from fastrunner.views import run_all_auto_case
 from mock.views import MockAPILogViewSet, MockAPIView, MockAPIViewset, MockProjectViewSet
 from system import views as system_views
 
@@ -68,7 +67,7 @@
     # 执行定时任务
     # TODO 需要增加触发检验，暂时关闭触发入口
     # re_path(r'^run_all_auto_case/$', run_all_auto_case.run_all_auto_case, name='run_all_auto_case'),
-    path("get_report_url/", run_all_auto_case.get_report_url, name="get_report_url"),
+    # path("get_report_url/", run_all_auto_case.get_report_url, name="get_report_url"),
     # swagger
     re_path(r"^swagger(?P<format>\.json|\.yaml)$", schema_view.without_ui(cache_timeout=0), name="schema-json"),
     path("swagger/", schema_view.with_ui("swagger", cache_timeout=0), name="schema-swagger-ui",),

FasterRunner/urls.py

@@ -10,6 +10,7 @@
 SECRET_KEY = 'test-secret-key-for-ci-only'
 DEBUG = False
 ALLOWED_HOSTS = ['*']
+USE_LDAP = False
 
 LOGGING = {
     'version': 1,
@@ -24,3 +25,4 @@
         'level': 'ERROR',
     },
 }
+EOF < /dev/null

ci_settings.py

@@ -7,6 +7,7 @@
 import pytest
 from django.conf import settings
 from django.test.utils import get_runner
+from django.utils.crypto import get_random_string
 
 
 def pytest_configure(config):
@@ -44,7 +45,7 @@ def authenticated_user():
     user = MyUser.objects.create_user(
         username='testuser',
         email='test@example.com',
-        password='testpass123'
+        password=get_random_string(32)
     )
     return user
 

conftest.py

@@ -8,6 +8,7 @@
 # @Software: PyCharm
 
 from django.test import TestCase
+from django.utils.crypto import get_random_string
 
 from fastuser import models
 
@@ -21,7 +22,9 @@ def setUp(self):
             "email": "1@1.com"
         }
         """
-        models.UserInfo.objects.create(username="rikasai", password="mypassword", email="lihuacai168@gmail.com")
+        models.UserInfo.objects.create(
+            username="rikasai", password=get_random_string(32), email="lihuacai168@gmail.com"
+        )
 
     def test_user_register(self):
         res = models.UserInfo.objects.get(username="rikasai")

fastrunner/test.py

@@ -33,15 +33,31 @@ class StandResponse(ErrorMsg, GenericModel, Generic[GenericResultsType]):
 
 SYSTEM_ERROR = {"code": "9999", "success": False, "msg": "System Error"}
 
+VALIDATE_ERROR = {"code": "9998", "success": False, "msg": "参数校验错误"}
+
+AUTH_FAIL = {"code": "9997", "success": False, "msg": "请登录"}
+
+SYSTEM_SUCCESS = {"code": "0000", "success": True, "msg": "成功"}
+
 TREE_ADD_SUCCESS = {"code": "0001", "success": True, "msg": "树形结构添加成功"}
 
 TREE_UPDATE_SUCCESS = {"code": "0002", "success": True, "msg": "树形结构更新成功"}
 
+TREE_DELETE_SUCCESS = {"code": "0003", "success": True, "msg": "树形结构删除成功"}
+
+TREE_NOT_EXISTS = {"code": "0102", "success": False, "msg": "节点不存在"}
+
 KEY_MISS = {"code": "0100", "success": False, "msg": "请求数据非法"}
 
 FILE_UPLOAD_SUCCESS = {"code": "0001", "success": True, "msg": "文件上传成功"}
 
 FILE_EXISTS = {"code": "0101", "success": False, "msg": "文件已存在,默认使用已有文件"}
+
+FILE_UPLOAD_ERROR = {"code": "0103", "success": False, "msg": "文件上传失败"}
+
+DEBUG_TALK_SUCCESS = {"code": "0001", "success": True, "msg": "Debugtalk更新成功"}
+
+CASE_STEP_NOT_EXIST = {"code": "0104", "success": False, "msg": "用例步骤不存在"}
 YAPI_ADD_SUCCESS = {"code": "0001", "success": True, "msg": "导入YAPI接口添加成功"}
 
 YAPI_ADD_FAILED = {"code": "0103", "success": False, "msg": "导入YAPI接口失败"}
@@ -60,8 +76,12 @@ class StandResponse(ErrorMsg, GenericModel, Generic[GenericResultsType]):
 
 API_DEL_SUCCESS = {"code": "0003", "success": True, "msg": "API删除成功"}
 
+API_DELETE_SUCCESS = {"code": "0003", "success": True, "msg": "API删除成功"}
+
 REPORT_DEL_SUCCESS = {"code": "0003", "success": True, "msg": "报告删除成功"}
 
+REPORT_DELETE_SUCCESS = {"code": "0003", "success": True, "msg": "报告删除成功"}
+
 API_UPDATE_SUCCESS = {"code": "0002", "success": True, "msg": "API更新成功"}
 
 SUITE_ADD_SUCCESS = {"code": "0001", "success": True, "msg": "Suite添加成功"}
@@ -101,8 +121,12 @@ class StandResponse(ErrorMsg, GenericModel, Generic[GenericResultsType]):
 
 CONFIG_UPDATE_SUCCESS = {"code": "0002", "success": True, "msg": "环境更新成功"}
 
+CONFIG_DELETE_SUCCESS = {"code": "0003", "success": True, "msg": "环境删除成功"}
+
 VARIABLES_UPDATE_SUCCESS = {"code": "0002", "success": True, "msg": "全局变量更新成功"}
 
+VARIABLES_DELETE_SUCCESS = {"code": "0003", "success": True, "msg": "全局变量删除成功"}
+
 TASK_ADD_SUCCESS = {"code": "0001", "success": True, "msg": "定时任务新增成功"}
 
 TASK_UPDATE_SUCCESS = {"code": "0002", "success": True, "msg": "定时任务更新成功"}
@@ -127,6 +151,18 @@ class StandResponse(ErrorMsg, GenericModel, Generic[GenericResultsType]):
 
 TASK_RUN_SUCCESS = {"code": "0001", "success": True, "msg": "用例运行中，请稍后查看报告"}
 
+TASK_NOT_EXIST = {"code": "0005", "success": False, "msg": "任务不存在"}
+
+TASK_HAS_RUN = {"code": "0006", "success": False, "msg": "任务正在运行中"}
+
+SCHEDULE_ADD_SUCCESS = {"code": "0001", "success": True, "msg": "调度添加成功"}
+
+SCHEDULE_UPDATE_SUCCESS = {"code": "0002", "success": True, "msg": "调度更新成功"}
+
+SCHEDULE_DELETE_SUCCESS = {"code": "0003", "success": True, "msg": "调度删除成功"}
+
+SCHEDULE_NOT_EXISTS = {"code": "0102", "success": False, "msg": "调度不存在"}
+
 
 PLAN_DEL_SUCCESS = {"code": "0003", "success": True, "msg": "集成计划删除成功"}
 
@@ -147,4 +183,13 @@ class StandResponse(ErrorMsg, GenericModel, Generic[GenericResultsType]):
 HOSTIP_EXISTS = {"code": "0101", "success": False, "msg": "此域名已存在，请重新命名"}
 
 HOSTIP_UPDATE_SUCCESS = {"code": "0002", "success": True, "msg": "域名更新成功"}
+
+HOST_ADD_SUCCESS = {"code": "0001", "success": True, "msg": "主机添加成功"}
+
+HOST_UPDATE_SUCCESS = {"code": "0002", "success": True, "msg": "主机更新成功"}
+
+HOST_DELETE_SUCCESS = {"code": "0003", "success": True, "msg": "主机删除成功"}
+
+HOST_NOT_EXISTS = {"code": "0102", "success": False, "msg": "主机不存在"}
+
 HOST_DEL_SUCCESS = {"code": "0003", "success": True, "msg": "域名删除成功"}