From 1600f0654d6c3f46aae1242199aa61f7af223a2a Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 30 Dec 2023 15:16:29 +0800
Subject: [PATCH] fix: s3 for minio finished

---
 tests/army/enterprise/s3/s3_basic.json |  2 +-
 tests/army/enterprise/s3/s3_basic.py   |  6 +++---
 tests/army/frame/srvCtl.py             |  2 +-
 tests/parallel_test/cases.task         | 11 +++++++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/army/enterprise/s3/s3_basic.json b/tests/army/enterprise/s3/s3_basic.json
index 169da290bf..e56a18e757 100644
--- a/tests/army/enterprise/s3/s3_basic.json
+++ b/tests/army/enterprise/s3/s3_basic.json
@@ -29,7 +29,7 @@
                     "childtable_prefix": "d",
                     "insert_mode": "taosc",
                     "timestamp_step": 1000,
-                    "start_timestamp":"now-15d",
+                    "start_timestamp":"now-13d",
                     "columns": [
                         { "type": "bool",        "name": "bc"},
                         { "type": "float",       "name": "fc" },
diff --git a/tests/army/enterprise/s3/s3_basic.py b/tests/army/enterprise/s3/s3_basic.py
index 85beb195c3..389b8a52c7 100644
--- a/tests/army/enterprise/s3/s3_basic.py
+++ b/tests/army/enterprise/s3/s3_basic.py
@@ -68,12 +68,12 @@ class TDTestCase(TBase):
         self.compactDb()
 
         # sleep 70s
-        tdLog.info(f"wait 70s ...")
-        time.sleep(70)
+        tdLog.info(f"wait 65s ...")
+        time.sleep(65)
         self.trimDb(True)
 
         rootPath = sc.clusterRootPath()
-        cmd = f"ls {rootPath}/dnode1/data02/vnode/vnode*/tsdb/*.data"
+        cmd = f"ls {rootPath}/dnode1/data20/vnode/vnode*/tsdb/*.data"
         tdLog.info(cmd)
         loop = 0
         while len(eos.runRetList(cmd)) > 0 and loop < 40:
diff --git a/tests/army/frame/srvCtl.py b/tests/army/frame/srvCtl.py
index 75f0d79513..155c83094d 100644
--- a/tests/army/frame/srvCtl.py
+++ b/tests/army/frame/srvCtl.py
@@ -32,7 +32,7 @@ class srvCtl:
 
     # get cluster root path like /root/TDinternal/sim/ 
     def clusterRootPath(self):
-        return tdDnodes.path 
+        return tdDnodes.getDnodesRootDir()
 
     # return dnode data files list
     def dnodeDataFiles(self, idx):
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index b5cde02d25..e7395a26f1 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -5,10 +5,17 @@
 #unit-test
 ,,y,unit-test,bash test.sh
 
-#army-test
+#
+# army-test
+#
 ,,y,army,./pytest.sh python3 ./test.py -f enterprise/multi-level/mlevel_basic.py -N 3 -L 3 -D 2
+,,y,army,./pytest.sh python3 ./test.py -f enterprise/s3/s3_basic.py -L 3 -D 1
 
-#system test
+
+
+#
+# system test
+#
 ,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/stream_basic.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/scalar_function.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/at_once_interval.py