1

780934be · 王英豪 · 1845f024 · 780934be · 780934be · 780934be
Commit 780934be authored Oct 26, 2022 by 王英豪
23 changed files
--- a/.gitignore
+++ b/.gitignore
+dist/
+dist/*
+.idea/*
+.idear/*
+.vscode
+*.zip
+*.pyc
--- a/AutomatedTestPlatform/__pycache__/settings.cpython-37.pyc
+++ b/AutomatedTestPlatform/__pycache__/settings.cpython-37.pyc
--- a/AutomatedTestPlatform/__pycache__/urls.cpython-37.pyc
+++ b/AutomatedTestPlatform/__pycache__/urls.cpython-37.pyc
--- a/automated_main/migrations/__pycache__/0004_testingprogress.cpython-37.pyc
+++ b/automated_main/migrations/__pycache__/0004_testingprogress.cpython-37.pyc
--- a/automated_main/migrations/__pycache__/0005_auto_20221024_2044.cpython-37.pyc
+++ b/automated_main/migrations/__pycache__/0005_auto_20221024_2044.cpython-37.pyc
--- a/automated_main/models/__init__.py
+++ b/automated_main/models/__init__.py
@@ -10,37 +10,8 @@ from automated_main.models.ui_automation.ui_element_operation import UIElementsO
 from automated_main.models.ui_automation.ui_page_element import UIPageElement
 from automated_main.models.ui_automation.ui_test_case import UITestCase, UITestCaseAssociated
 from automated_main.models.ui_automation.ui_test_task import UITestTask, UITestResult
-<<<<<<< HEAD
 from automated_main.models.performance_test.performance_project import PerformanceProject
 from automated_main.models.performance_test.performance_script import PerformanceScript
 from automated_main.models.performance_test.performance_report import PerformanceReport
-
-
-
-=======
-
-"""
-8.19 弃用
-"""
-# from automated_main.models.api_automation.api_project import APIProject
-# from automated_main.models.api_automation.api_module import APIModule
-from automated_main.models.api_automation.api_environment import APIEnvironment
-
-"""
-8.19 弃用
-"""
-# from automated_main.models.api_automation.api_test_case import ApiTestCase
-# from automated_main.models.api_automation.api_business_test import ApiBusinessTest, ApiBusinessTestAssociated
-# from automated_main.models.api_automation.api_test_task import APITestTask, APITestResultAssociated, APITestResult
-from automated_main.models.performance_test.performance_project import PerformanceProject
-from automated_main.models.performance_test.performance_script import PerformanceScript
-from automated_main.models.performance_test.performance_report import PerformanceReport
-from automated_main.models.api_automation.api_database import APIDatabase
-from automated_main.models.api_automation.api_management import ApiManagement
-from automated_main.models.api_automation.api_interfaces_case import ApiInterfacesCase
-from automated_main.models.api_automation.api_scenarios_case import ApiScenariosCaseAssociated, \
-    ApiScenariosCaseAssociated
-from automated_main.models.api_automation.api_test_plan import ApiTestPlan
 from automated_main.models.testing_progress.testing_progress import TestingProgress
->>>>>>> test

--- a/automated_main/models/__pycache__/__init__.cpython-37.pyc
+++ b/automated_main/models/__pycache__/__init__.cpython-37.pyc
--- a/automated_main/models/testing_progress/__pycache__/__init__.cpython-37.pyc
+++ b/automated_main/models/testing_progress/__pycache__/__init__.cpython-37.pyc
--- a/automated_main/models/testing_progress/__pycache__/testing_progress.cpython-37.pyc
+++ b/automated_main/models/testing_progress/__pycache__/testing_progress.cpython-37.pyc
--- a/automated_main/url/testing_progress_url/__pycache__/__init__.cpython-37.pyc
+++ b/automated_main/url/testing_progress_url/__pycache__/__init__.cpython-37.pyc
--- a/automated_main/url/testing_progress_url/__pycache__/testing_progress_url.cpython-37.pyc
+++ b/automated_main/url/testing_progress_url/__pycache__/testing_progress_url.cpython-37.pyc
--- a/automated_main/view/performance_test/performance_project/__pycache__/performance_project_view.cpython-37.pyc
+++ b/automated_main/view/performance_test/performance_project/__pycache__/performance_project_view.cpython-37.pyc
--- a/automated_main/view/performance_test/performance_script/__pycache__/performance_script_view.cpython-37.pyc
+++ b/automated_main/view/performance_test/performance_script/__pycache__/performance_script_view.cpython-37.pyc
--- a/automated_main/view/testing_progress/PersonnelAllocation/__pycache__/__init__.cpython-37.pyc
+++ b/automated_main/view/testing_progress/PersonnelAllocation/__pycache__/__init__.cpython-37.pyc
--- a/automated_main/view/testing_progress/PersonnelAllocation/__pycache__/personnel_allocation_view.cpython-37.pyc
+++ b/automated_main/view/testing_progress/PersonnelAllocation/__pycache__/personnel_allocation_view.cpython-37.pyc
--- a/automated_main/view/testing_progress/__pycache__/__init__.cpython-37.pyc
+++ b/automated_main/view/testing_progress/__pycache__/__init__.cpython-37.pyc
--- a/automated_main/view/ui_automation/ui_element_operation/__pycache__/ui_element_operation_view.cpython-37.pyc
+++ b/automated_main/view/ui_automation/ui_element_operation/__pycache__/ui_element_operation_view.cpython-37.pyc
--- a/automated_main/view/ui_automation/ui_page/__pycache__/ui_page_view.cpython-37.pyc
+++ b/automated_main/view/ui_automation/ui_page/__pycache__/ui_page_view.cpython-37.pyc
--- a/automated_main/view/ui_automation/ui_page_element/__pycache__/ui_page_element_view.cpython-37.pyc
+++ b/automated_main/view/ui_automation/ui_page_element/__pycache__/ui_page_element_view.cpython-37.pyc
--- a/automated_main/view/ui_automation/ui_positioning/__pycache__/ui_positioning_view.cpython-37.pyc
+++ b/automated_main/view/ui_automation/ui_positioning/__pycache__/ui_positioning_view.cpython-37.pyc
--- a/automated_main/view/ui_automation/ui_project/__pycache__/ui_project_view.cpython-37.pyc
+++ b/automated_main/view/ui_automation/ui_project/__pycache__/ui_project_view.cpython-37.pyc
--- a/automated_main/view/ui_automation/ui_test_case/__pycache__/ui_test_case_view.cpython-37.pyc
+++ b/automated_main/view/ui_automation/ui_test_case/__pycache__/ui_test_case_view.cpython-37.pyc
--- a/automated_main/view/ui_automation/ui_test_task/__pycache__/ui_test_task_view.cpython-37.pyc
+++ b/automated_main/view/ui_automation/ui_test_task/__pycache__/ui_test_task_view.cpython-37.pyc