diff --git a/tests/army/community/cluster/snapshot.py b/tests/army/community/cluster/snapshot.py index eef650cc77..d18dbf2796 100644 --- a/tests/army/community/cluster/snapshot.py +++ b/tests/army/community/cluster/snapshot.py @@ -30,7 +30,7 @@ from frame.srvCtl import * class TDTestCase(TBase): updatecfgDict = { - "countAlwaysReturnValue" : "0", + "countAlwaysReturnValue" : "1", "lossyColumns" : "float,double", "fPrecision" : "0.000000001", "dPrecision" : "0.00000000000000001", @@ -106,7 +106,7 @@ class TDTestCase(TBase): # check count always return value sql = f"select count(*) from {self.db}.ta" tdSql.query(sql) - tdSql.checkRows(0) # countAlwaysReturnValue is false + tdSql.checkRows(1) # countAlwaysReturnValue is false # run def run(self): diff --git a/tests/army/community/storage/compressBasic.py b/tests/army/community/storage/compressBasic.py index c0975c6d75..db52c9baf8 100644 --- a/tests/army/community/storage/compressBasic.py +++ b/tests/army/community/storage/compressBasic.py @@ -118,18 +118,10 @@ class TDTestCase(TBase): sql = f"describe {self.db}.{self.stb}" tdSql.query(sql) - ''' # see AutoGen.types defEncodes = [ "delta-i","delta-i","simple8b","simple8b","simple8b","simple8b","simple8b","simple8b", "simple8b","simple8b","delta-d","delta-d","bit-packing", - "disabled","disabled","disabled","disabled","disabled"] - ''' - - # pass-ci have error - defEncodes = [ "delta-i","delta-i","simple8b","simple8b","simple8b","simple8b","simple8b","simple8b", - "simple8b","simple8b","delta-d","delta-d","bit-packing", - "disabled","disabled","disabled","disabled","simple8b"] - + "disabled","disabled","disabled","disabled"] count = tdSql.getRows() for i in range(count): diff --git a/tests/army/enterprise/s3/s3Basic.json b/tests/army/enterprise/s3/s3Basic.json index 4a2f4496f9..ef1585d2ba 100644 --- a/tests/army/enterprise/s3/s3Basic.json +++ b/tests/army/enterprise/s3/s3Basic.json @@ -32,7 +32,7 @@ { "name": "stb", "child_table_exists": "no", - "childtable_count": 10, + "childtable_count": 6, "insert_rows": 2000000, "childtable_prefix": "d", "insert_mode": "taosc", diff --git a/tests/army/enterprise/s3/s3Basic.py b/tests/army/enterprise/s3/s3Basic.py index b4b18e355e..8045a3f308 100644 --- a/tests/army/enterprise/s3/s3Basic.py +++ b/tests/army/enterprise/s3/s3Basic.py @@ -38,6 +38,10 @@ s3EndPoint http://192.168.1.52:9000 s3AccessKey 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX' s3BucketName ci-bucket s3UploadDelaySec 60 + +for test: +"s3AccessKey" : "fGPPyYjzytw05nw44ViA:vK1VcwxgSOykicx6hk8fL1x15uEtyDSFU3w4hTaZ" +"s3BucketName": "test-bucket" ''' @@ -63,7 +67,7 @@ class TDTestCase(TBase): tdSql.execute(f"use {self.db}") # come from s3_basic.json - self.childtable_count = 10 + self.childtable_count = 6 self.insert_rows = 2000000 self.timestamp_step = 1000 @@ -85,7 +89,7 @@ class TDTestCase(TBase): fileName = cols[8] #print(f" filesize={fileSize} fileName={fileName} line={line}") if fileSize > maxFileSize: - tdLog.info(f"error, {fileSize} over max size({maxFileSize})\n") + tdLog.info(f"error, {fileSize} over max size({maxFileSize}) {fileName}\n") overCnt += 1 else: tdLog.info(f"{fileName}({fileSize}) check size passed.") @@ -99,7 +103,7 @@ class TDTestCase(TBase): loop = 0 rets = [] overCnt = 0 - while loop < 180: + while loop < 100: time.sleep(3) # check upload to s3 @@ -335,7 +339,7 @@ class TDTestCase(TBase): self.snapshotAgg() self.doAction() self.checkAggCorrect() - self.checkInsertCorrect(difCnt=self.childtable_count*999999) + self.checkInsertCorrect(difCnt=self.childtable_count*1499999) self.checkDelete() self.doAction() diff --git a/tests/army/enterprise/s3/s3Basic1.json b/tests/army/enterprise/s3/s3Basic1.json index ef7a169f77..fb95c14e98 100644 --- a/tests/army/enterprise/s3/s3Basic1.json +++ b/tests/army/enterprise/s3/s3Basic1.json @@ -32,7 +32,7 @@ { "name": "stb", "child_table_exists": "yes", - "childtable_count": 10, + "childtable_count": 6, "insert_rows": 1000000, "childtable_prefix": "d", "insert_mode": "taosc", diff --git a/tests/army/frame/caseBase.py b/tests/army/frame/caseBase.py index 21265d2fea..491e432df7 100644 --- a/tests/army/frame/caseBase.py +++ b/tests/army/frame/caseBase.py @@ -140,7 +140,7 @@ class TBase: # check step sql = f"select count(*) from (select diff(ts) as dif from {self.stb} partition by tbname order by ts desc) where dif != {self.timestamp_step}" - #tdSql.checkAgg(sql, difCnt) + tdSql.checkAgg(sql, difCnt) # save agg result def snapshotAgg(self):