v1.0.11

smart-test-ti · Sep 27, 2023 · 9ce4dfd · 9ce4dfd
1 parent 9726402
commit 9ce4dfd
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/webmeter/core/engine.py b/webmeter/core/engine.py
@@ -1,9 +1,9 @@
 import os
 import datetime
 from loguru import logger
-from core.utils import Common, Platform
-from core.sqlhandle import crud
-from core.task import TaskBase
+from webmeter.core.utils import Common, Platform
+from webmeter.core.sqlhandle import crud
+from webmeter.core.task import TaskBase
 
 class EngineServie(TaskBase):
 

diff --git a/webmeter/core/file/template.jmx b/webmeter/core/file/template.jmx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jmeterTestPlan version="1.2" properties="5.0" jmeter="5.5">
   <hashTree>
-    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan1" enabled="true">
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
       <boolProp name="TestPlan.tearDown_on_shutdown">false</boolProp>
@@ -12,7 +12,7 @@
       <stringProp name="TestPlan.user_define_classpath"></stringProp>
     </TestPlan>
     <hashTree>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group1" enabled="true">
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
         <stringProp name="TestPlan.comments">Thread Group Comment</stringProp>
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
@@ -27,7 +27,7 @@
         <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
       </ThreadGroup>
       <hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request1" enabled="true">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>

diff --git a/webmeter/core/plan.py b/webmeter/core/plan.py
@@ -2,7 +2,7 @@
 import shutil
 from loguru import logger
 from fastapi import UploadFile
-from core.utils import Common, JMX
+from webmeter.core.utils import Common, JMX
 
 
 class Base(object):

diff --git a/webmeter/core/sqlhandle/crud.py b/webmeter/core/sqlhandle/crud.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from loguru import logger
 import os, shutil, datetime
-from core.sqlhandle import models, schemas, database
-from core.plan import TestPlan
+from webmeter.core.sqlhandle import models, schemas, database
+from webmeter.core.plan import TestPlan
 
 def create_task(tasks: dict):
     with database.dbConnect() as session:

diff --git a/webmeter/core/sqlhandle/database.py b/webmeter/core/sqlhandle/database.py
@@ -4,7 +4,7 @@
 from contextlib import contextmanager
 from loguru import logger
 import os
-from core.utils import Common
+from webmeter.core.utils import Common
 
 SQL_DIR = Common.make_dir(os.path.join(os.getcwd(), 'webmeter'))
 SQLALCHEMY_DATABASE_URL = "sqlite:///{}/app.db".format(SQL_DIR)

diff --git a/webmeter/core/sqlhandle/models.py b/webmeter/core/sqlhandle/models.py
@@ -1,5 +1,5 @@
 from sqlalchemy import Boolean, Column, Integer, String, DateTime, Float
-from core.sqlhandle.database import Base
+from webmeter.core.sqlhandle.database import Base
 
 
 class Task(Base):

diff --git a/webmeter/core/task.py b/webmeter/core/task.py
@@ -1,8 +1,8 @@
 from loguru import logger
 import json, os
 from typing import Optional
-from core.utils import Common
-from core.sqlhandle import crud
+from webmeter.core.utils import Common
+from webmeter.core.sqlhandle import crud
 
 
 class TaskBase(object):

diff --git a/webmeter/view/api.py b/webmeter/view/api.py
@@ -1,12 +1,12 @@
 from loguru import logger
 from typing import Union
 from fastapi import APIRouter, UploadFile, File, Form
-from core.plan import TestPlan
-from core.engine import EngineServie
-from core.sqlhandle import crud, models, schemas
-from core.sqlhandle.database import engine
-from core.task import TaskDetail
-from core.utils import Performance
+from webmeter.core.plan import TestPlan
+from webmeter.core.engine import EngineServie
+from webmeter.core.sqlhandle import crud, models, schemas
+from webmeter.core.sqlhandle.database import engine
+from webmeter.core.task import TaskDetail
+from webmeter.core.utils import Performance
 router = APIRouter()
 test_plan = TestPlan()
 models.Base.metadata.create_all(bind=engine)