From 3309e7b536cfadf4ad0f10228bd6c05efc1b97af Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 14 Nov 2024 17:14:42 +0800
Subject: [PATCH] fix: adjust bucket to 40 and exit drop db

---
 tests/army/storage/s3/s3Basic.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/army/storage/s3/s3Basic.py b/tests/army/storage/s3/s3Basic.py
index 273a6129e1..cefd4ef60d 100644
--- a/tests/army/storage/s3/s3Basic.py
+++ b/tests/army/storage/s3/s3Basic.py
@@ -47,7 +47,7 @@ for test:
 
 
 class TDTestCase(TBase):
-    index = eutil.cpuRand(20) + 1
+    index = eutil.cpuRand(40) + 1
     bucketName = f"ci-bucket{index}"
     updatecfgDict = {
         "supportVnodes":"1000",
@@ -63,6 +63,10 @@ class TDTestCase(TBase):
     tdLog.info(f"assign bucketName is {bucketName}\n")
     maxFileSize = (128 + 10) * 1014 * 1024 # add 10M buffer
 
+    def exit(self, log):
+        self.dropDb(True)
+        tdLog.exit(log)
+
     def insertData(self):
         tdLog.info(f"insert data.")
         # taosBenchmark run
@@ -107,8 +111,8 @@ class TDTestCase(TBase):
         loop = 0
         rets = []
         overCnt = 0
-        while loop < 200:
-            time.sleep(3)
+        while loop < 150:
+            time.sleep(2)
 
             # check upload to s3
             rets = eos.runRetList(cmd)
@@ -134,7 +138,7 @@ class TDTestCase(TBase):
                 
         # check can pass
         if overCnt > 0:
-            tdLog.exit(f"s3 have {overCnt} files over size.")
+            self.exit(f"s3 have {overCnt} files over size.")
 
 
     def doAction(self):
@@ -159,7 +163,7 @@ class TDTestCase(TBase):
                 return True
             time.sleep(1)
             
-        tdLog.exit(f"stream count is not expect . expect = 100000 or 100001 real={count} . sql={sql}")
+        self.exit(f"stream count is not expect . expect = 100000 or 100001 real={count} . sql={sql}")
 
 
     def checkCreateDb(self, keepLocal, chunkSize, compact):