modify format by autopep8.

tests/pytest/query/filterAllIntTypes.py

@@ -35,20 +35,30 @@ class TDTestCase:
             curType = self.types[i]
             print("======= Verify filter for %s type =========" % (curType))
             tdLog.debug(
-                "create table st%s(ts timestamp, num %s) tags(id %s)" % (curType, curType, curType))
+                "create table st%s(ts timestamp, num %s) tags(id %s)" %
+                (curType, curType, curType))
             tdSql.execute(
-                "create table st%s(ts timestamp, num %s) tags(id %s)" % (curType, curType, curType))
+                "create table st%s(ts timestamp, num %s) tags(id %s)" %
+                (curType, curType, curType))
 
-            #create 10 tables, insert 10 rows for each table
+            # create 10 tables, insert 10 rows for each table
             for j in range(self.rowNum):
-                tdSql.execute("create table st%s%d using st%s tags(%d)" % (curType, j + 1, curType, j + 1))
+                tdSql.execute(
+                    "create table st%s%d using st%s tags(%d)" %
+                    (curType, j + 1, curType, j + 1))
                 for k in range(self.rowNum):
-                    tdSql.execute("insert into st%s%d values(%d, %d)" % (curType, j + 1, self.ts + k + 1, j * 10 + k + 1))
-            
-            tdSql.error("insert into st%s10 values(%d, %d)" % (curType, self.ts + 11, pow(2, self.powers[i])))
-            tdSql.execute("insert into st%s10 values(%d, %d)" % (curType, self.ts + 12, pow(2, self.powers[i]) - 1))
-            tdSql.error("insert into st%s10 values(%d, %d)" % (curType, self.ts + 13, pow(-2, self.powers[i])))
-            tdSql.execute("insert into st%s10 values(%d, %d)" % (curType, self.ts + 14, pow(-2, self.powers[i]) + 1)) 
+                    tdSql.execute(
+                        "insert into st%s%d values(%d, %d)" %
+                        (curType, j + 1, self.ts + k + 1, j * 10 + k + 1))
+
+            tdSql.error("insert into st%s10 values(%d, %d)" %
+                        (curType, self.ts + 11, pow(2, self.powers[i])))
+            tdSql.execute("insert into st%s10 values(%d, %d)" %
+                          (curType, self.ts + 12, pow(2, self.powers[i]) - 1))
+            tdSql.error("insert into st%s10 values(%d, %d)" %
+                        (curType, self.ts + 13, pow(-2, self.powers[i])))
+            tdSql.execute("insert into st%s10 values(%d, %d)" %
+                          (curType, self.ts + 14, pow(-2, self.powers[i]) + 1))
 
             # > for int type on column
             tdSql.query("select * from st%s where num > 50" % curType)
@@ -106,7 +116,9 @@ class TDTestCase:
             tdSql.query("select * from st%s where id != 5" % curType)
             tdSql.checkRows(92)
 
-            print("======= Verify filter for %s type finished =========" % curType)
+            print(
+                "======= Verify filter for %s type finished =========" %
+                curType)
 
     def stop(self):
         tdSql.close()

tests/pytest/query/filterFloatAndDouble.py

@@ -36,8 +36,8 @@ class TDTestCase:
             "create table st(ts timestamp, num float, speed double) tags(tagcol1 float, tagcol2 double)")
 
         for j in range(self.rowNum):
-            tdSql.execute(
-                "insert into st1 using st tags(1.1, 2.3) values(%d, %f, %f)" % (self.ts + j + 1, 1.1 * (j + 1), 2.3 * (j + 1)))    
+            tdSql.execute("insert into st1 using st tags(1.1, 2.3) values(%d, %f, %f)" % (
+                self.ts + j + 1, 1.1 * (j + 1), 2.3 * (j + 1)))
 
         # > for float type on column
         tdSql.query("select * from st where num > 5.5")

tests/pytest/query/filterOtherTypes.py

@@ -36,11 +36,17 @@ class TDTestCase:
 
         tdSql.execute("create table st1 using st tags(true, 'table1', '水表')")
         for i in range(1, 6):
-            tdSql.execute("insert into st1 values(%d, %d, 'taosdata%d', '涛思数据%d')" % (self.ts + i, i % 2, i, i)) 
+            tdSql.execute(
+                "insert into st1 values(%d, %d, 'taosdata%d', '涛思数据%d')" %
+                (self.ts + i, i %
+                 2, i, i))
 
         tdSql.execute("create table st2 using st tags(false, 'table2', '电表')")
         for i in range(6, 11):
-            tdSql.execute("insert into st2 values(%d, %d, 'taosdata%d', '涛思数据%d')" % (self.ts + i, i % 2, i, i))  
+            tdSql.execute(
+                "insert into st2 values(%d, %d, 'taosdata%d', '涛思数据%d')" %
+                (self.ts + i, i %
+                 2, i, i))
 
         # =============Verify stable columns====================
         # > for bool type on column
@@ -359,4 +365,3 @@ class TDTestCase:
 
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())
-

tests/pytest/query/querySort.py

@@ -40,12 +40,11 @@ class TDTestCase:
                 tagcol6 double, tagcol7 bool, tagcol8 nchar(20), tagcol9 binary(20))''')
 
         for i in range(self.rowNum):
-            tdSql.execute("create table st%d using st tags(%d, %d, %d, %d, %f, %f, %d, 'tag%d', '标签%d')" % (i + 1, i + 1, i + 1, i + 1, i + 1, 1.1 * (i + 1), 
-            1.23 * (i + 1), (i + 1) % 2, i + 1, i + 1))
+            tdSql.execute("create table st%d using st tags(%d, %d, %d, %d, %f, %f, %d, 'tag%d', '标签%d')" % (
+                i + 1, i + 1, i + 1, i + 1, i + 1, 1.1 * (i + 1), 1.23 * (i + 1), (i + 1) % 2, i + 1, i + 1))
             for j in range(self.rowNum):
-                tdSql.execute("insert into st%d values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" % (i + 1, self.ts + 10 * (i + 1) + j + 1, 
-                        j + 1, j + 1, j + 1, j + 1, 1.1 * (j + 1), 1.23 * (j + 1), (j + 1) % 2, j + 1, j + 1))
-        
+                tdSql.execute("insert into st%d values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" % (
+                    i + 1, self.ts + 10 * (i + 1) + j + 1, j + 1, j + 1, j + 1, j + 1, 1.1 * (j + 1), 1.23 * (j + 1), (j + 1) % 2, j + 1, j + 1))
 
         print("======= step 2: verify order for each column =========")
         # sort for timestamp in asc order
@@ -56,19 +55,24 @@ class TDTestCase:
         tdSql.query("select * from st order by ts desc")
         tdSql.checkColumnSorted(0, "desc")
 
-
         for i in range(1, 10):
             tdSql.error("select * from st order by tbcol%d" % i)
             tdSql.error("select * from st order by tbcol%d asc" % i)
             tdSql.error("select * from st order by tbcol%d desc" % i)
 
-            tdSql.query("select avg(tbcol1) from st group by tagcol%d order by tagcol%d" % (i, i))        
+            tdSql.query(
+                "select avg(tbcol1) from st group by tagcol%d order by tagcol%d" %
+                (i, i))
             tdSql.checkColumnSorted(1, "")
 
-            tdSql.query("select avg(tbcol1) from st group by tagcol%d order by tagcol%d asc" % (i, i))        
+            tdSql.query(
+                "select avg(tbcol1) from st group by tagcol%d order by tagcol%d asc" %
+                (i, i))
             tdSql.checkColumnSorted(1, "asc")
 
-            tdSql.query("select avg(tbcol1) from st group by tagcol%d order by tagcol%d desc" % (i, i))        
+            tdSql.query(
+                "select avg(tbcol1) from st group by tagcol%d order by tagcol%d desc" %
+                (i, i))
             tdSql.checkColumnSorted(1, "desc")
 
     def stop(self):

tests/pytest/random-test/random-test.py

@@ -97,6 +97,8 @@ class Test:
                 "create table %s using %s tags (1, '表1')" %
                 (current_tb, self.last_stb))
             self.last_tb = current_tb
+            self.written = 0
+
             tdSql.execute(
                 "insert into %s values (now, 27, '我是nchar字符串')" %
                 self.last_tb)

tests/pytest/table/tablename-boundary.py

@@ -18,7 +18,10 @@ class TDTestCase:
         tdSql.prepare()
 
         getTableNameLen = "grep -w '#define TSDB_TABLE_NAME_LEN' ../../src/inc/taosdef.h|awk '{print $3}'"
-        tableNameMaxLen = int( subprocess.check_output(getTableNameLen, shell=True)) - 1
+        tableNameMaxLen = int(
+            subprocess.check_output(
+                getTableNameLen,
+                shell=True)) - 1
         tdLog.info("table name max length is %d" % tableNameMaxLen)
         chars = string.ascii_uppercase + string.ascii_lowercase
         tb_name = ''.join(random.choices(chars, k=tableNameMaxLen))

tests/pytest/tag_lite/change.py

@@ -93,9 +93,13 @@ class TDTestCase:
         tdSql.error("alter table ta_ch_mt2 change tag tgcol1 tgcol2")
         # TSIM: return -1
         # TSIM: step22:
-        # TSIM: sql alter table $mt change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20
-        tdLog.info("alter table ta_ch_mt2 change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20")
-        tdSql.error("alter table ta_ch_mt2 change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20")
+        # TSIM: sql alter table $mt change tag tgcol1
+        # xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x
+        # step20
+        tdLog.info(
+            "alter table ta_ch_mt2 change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20")
+        tdSql.error(
+            "alter table ta_ch_mt2 change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20")
         # TSIM: return -1
         # TSIM: step20:
         # TSIM:
@@ -267,8 +271,10 @@ class TDTestCase:
         tdSql.execute(
             'create table ta_ch_mt6 (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))')
         # TSIM: sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-        tdLog.info("create table tb6 using ta_ch_mt6 tags( '1', 2, 3, '4', 5, '6' )")
-        tdSql.execute("create table tb6 using ta_ch_mt6 tags( '1', 2, 3, '4', 5, '6' )")
+        tdLog.info(
+            "create table tb6 using ta_ch_mt6 tags( '1', 2, 3, '4', 5, '6' )")
+        tdSql.execute(
+            "create table tb6 using ta_ch_mt6 tags( '1', 2, 3, '4', 5, '6' )")
         # TSIM: sql insert into $tb values(now, 1)
         tdLog.info("insert into tb6 values(now, 1)")
         tdSql.execute("insert into tb6 values(now, 1)")

tests/pytest/util/sql.py

@@ -216,20 +216,26 @@ class TDSql:
 
         if order == "" or order.upper() == "ASC":
             if all(sorted(list) == list):
-                tdLog.info("sql:%s, column :%d is sorted in accending order as expected" %
+                tdLog.info(
+                    "sql:%s, column :%d is sorted in accending order as expected" %
                     (self.sql, col))
             else:
-                tdLog.exit("%s failed: sql:%s, col:%d is not sorted in accesnind order" %
+                tdLog.exit(
+                    "%s failed: sql:%s, col:%d is not sorted in accesnind order" %
                     (callerFilename, self.sql, col))
         elif order.upper() == "DESC":
             if all(sorted(list, reverse=True) == list):
-                tdLog.info("sql:%s, column :%d is sorted in decending order as expected" %
+                tdLog.info(
+                    "sql:%s, column :%d is sorted in decending order as expected" %
                     (self.sql, col))
             else:
-                tdLog.exit("%s failed: sql:%s, col:%d is not sorted in decending order" %
+                tdLog.exit(
+                    "%s failed: sql:%s, col:%d is not sorted in decending order" %
                     (callerFilename, self.sql, col))
         else:
-            tdLog.exit("%s failed: sql:%s, the order provided for col:%d is not correct" %
+            tdLog.exit(
+                "%s failed: sql:%s, the order provided for col:%d is not correct" %
                 (callerFilename, self.sql, col))
 
+
 tdSql = TDSql()