diff --git a/tests/army/frame/autogen.py b/tests/army/frame/autogen.py index 510402e039..9dca96e7b0 100644 --- a/tests/army/frame/autogen.py +++ b/tests/army/frame/autogen.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- import sys -from log import * -from cases import * -from sql import * +from frame.log import * +from frame.cases import * +from frame.sql import * import threading import random import string diff --git a/tests/army/frame/cases.py b/tests/army/frame/cases.py index f386e1cee3..590c0d3711 100644 --- a/tests/army/frame/cases.py +++ b/tests/army/frame/cases.py @@ -18,7 +18,7 @@ import datetime import inspect import importlib import traceback -from log import * +from frame.log import * class TDCase: diff --git a/tests/army/frame/cluster.py b/tests/army/frame/cluster.py index c9bf2c9f38..4da53840c0 100644 --- a/tests/army/frame/cluster.py +++ b/tests/army/frame/cluster.py @@ -5,11 +5,11 @@ import time import os import socket -from log import * -from sql import * -from cases import * -from dnodes import * -from common import * +from frame.log import * +from frame.sql import * +from frame.cases import * +from frame.dnodes import * +from frame.common import * class ClusterDnodes(TDDnodes): """rewrite TDDnodes and make MyDdnodes as TDDnodes child class""" diff --git a/tests/army/frame/common.py b/tests/army/frame/common.py index 45b1c940dd..b6e32ab52c 100644 --- a/tests/army/frame/common.py +++ b/tests/army/frame/common.py @@ -20,12 +20,12 @@ import json import toml from boundary import DataBoundary import taos -from log import * -from sql import * -from cases import * -from dnodes import * -from common import * -from constant import * +from frame.log import * +from frame.sql import * +from frame.cases import * +from frame.dnodes import * +from frame.common import * +from frame.constant import * from dataclasses import dataclass,field from typing import List from datetime import datetime diff --git a/tests/army/frame/dnodes-default.py b/tests/army/frame/dnodes-default.py index 26a2bd812f..a1d1698b00 100644 --- a/tests/army/frame/dnodes-default.py +++ b/tests/army/frame/dnodes-default.py @@ -15,7 +15,7 @@ import sys import os import os.path import subprocess -from log import * +from frame.log import * class TDSimClient: diff --git a/tests/army/frame/dnodes-no-random-fail.py b/tests/army/frame/dnodes-no-random-fail.py index 7a2e481f11..3b3083396b 100644 --- a/tests/army/frame/dnodes-no-random-fail.py +++ b/tests/army/frame/dnodes-no-random-fail.py @@ -15,7 +15,7 @@ import sys import os import os.path import subprocess -from log import * +from frame.log import * class TDSimClient: diff --git a/tests/army/frame/dnodes-random-fail.py b/tests/army/frame/dnodes-random-fail.py index a0e9e461b8..794adfd7ed 100644 --- a/tests/army/frame/dnodes-random-fail.py +++ b/tests/army/frame/dnodes-random-fail.py @@ -15,7 +15,7 @@ import sys import os import os.path import subprocess -from log import * +from frame.log import * class TDSimClient: diff --git a/tests/army/frame/dnodes.py b/tests/army/frame/dnodes.py index 5defd26973..5581f29a57 100644 --- a/tests/army/frame/dnodes.py +++ b/tests/army/frame/dnodes.py @@ -22,7 +22,7 @@ import base64 import json import copy from fabric2 import Connection -from log import * +from frame.log import * from shutil import which diff --git a/tests/army/frame/pathFinding.py b/tests/army/frame/pathFinding.py index 03d3978336..df03f0ed68 100644 --- a/tests/army/frame/pathFinding.py +++ b/tests/army/frame/pathFinding.py @@ -13,7 +13,7 @@ import os -from log import * +from frame.log import * diff --git a/tests/army/frame/sql.py b/tests/army/frame/sql.py index cc577c2b8e..6635b96100 100644 --- a/tests/army/frame/sql.py +++ b/tests/army/frame/sql.py @@ -20,7 +20,7 @@ import traceback import psutil import shutil import pandas as pd -from log import * +from frame.log import * from constant import * # from datetime import timezone diff --git a/tests/army/frame/sub.py b/tests/army/frame/sub.py index f5dadf1a63..1fa4dfa674 100644 --- a/tests/army/frame/sub.py +++ b/tests/army/frame/sub.py @@ -15,7 +15,7 @@ import sys import os import time import datetime -from log import * +from frame.log import * class TDSub: def __init__(self): diff --git a/tests/army/frame/taosadapter.py b/tests/army/frame/taosadapter.py index 70af8b9fa9..7830aab08c 100644 --- a/tests/army/frame/taosadapter.py +++ b/tests/army/frame/taosadapter.py @@ -1,7 +1,7 @@ import requests from fabric2 import Connection -from log import * -from common import * +from frame.log import * +from frame.common import * class TAdapter: diff --git a/tests/army/frame/taosdemoCfg.py b/tests/army/frame/taosdemoCfg.py index a2ad56ac94..5f8198681e 100644 --- a/tests/army/frame/taosdemoCfg.py +++ b/tests/army/frame/taosdemoCfg.py @@ -19,7 +19,7 @@ import inspect import psutil import shutil import json -from log import * +from frame.log import * from multiprocessing import cpu_count