From d2b8ef1c740ec228e767e3e647d76f66b80b3f1a Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Fri, 9 Jun 2023 09:20:38 +0800
Subject: [PATCH] fix: remove -y from taosdump test for 3.0 (#21663)

* fix: remove -y from taosdump test

* fix: taosdumpTestNanoSupport.py
---
 tests/pytest/tools/taosdumpTest.py            |  6 +++---
 tests/pytest/tools/taosdumpTest2.py           |  6 +++---
 tests/pytest/tools/taosdumpTestNanoSupport.py | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/pytest/tools/taosdumpTest.py b/tests/pytest/tools/taosdumpTest.py
index 4bfb7d5ba3..aafd365f34 100644
--- a/tests/pytest/tools/taosdumpTest.py
+++ b/tests/pytest/tools/taosdumpTest.py
@@ -92,9 +92,9 @@ class TDTestCase:
         else:
             tdLog.info("taosdump found: %s" % binPath)
 
-        os.system("%s -y --databases db -o ./taosdumptest/tmp1" % binPath)
+        os.system("%s --databases db -o ./taosdumptest/tmp1" % binPath)
         os.system(
-            "%s -y --databases db1 -o ./taosdumptest/tmp2" %
+            "%s --databases db1 -o ./taosdumptest/tmp2" %
             binPath)
 
         tdSql.execute("drop database db")
@@ -172,7 +172,7 @@ class TDTestCase:
         tdSql.query("show stables")
         tdSql.checkRows(2)
         os.system(
-            "%s -y --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" %
+            "%s --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" %
             binPath)
         tdSql.execute("drop database db12312313231231321312312312_323")
         os.system("%s -i ./taosdumptest/tmp1" % binPath)
diff --git a/tests/pytest/tools/taosdumpTest2.py b/tests/pytest/tools/taosdumpTest2.py
index 8a85ce10ed..36e0480e57 100644
--- a/tests/pytest/tools/taosdumpTest2.py
+++ b/tests/pytest/tools/taosdumpTest2.py
@@ -97,7 +97,7 @@ class TDTestCase:
         tdSql.query("show databases")
         tdSql.checkRows(2)
 
-        os.system("%s -i ./taosdumptest/tmp -y" % binPath)
+        os.system("%s -i ./taosdumptest/tmp" % binPath)
 
         tdSql.query("show databases")
         tdSql.checkRows(3)
@@ -125,13 +125,13 @@ class TDTestCase:
         os.system("rm ./taosdumptest/tmp/*.sql")
         os.system("rm ./taosdumptest/tmp/*.avro*")
         os.system("rm -rf ./taosdumptest/tmp/taosdump.*")
-        os.system("%s -D test -o ./taosdumptest/tmp -y" % binPath)
+        os.system("%s -D test -o ./taosdumptest/tmp" % binPath)
 
         tdSql.execute("drop database test")
         tdSql.query("show databases")
         tdSql.checkRows(3)
 
-        os.system("%s -i ./taosdumptest/tmp -y" % binPath)
+        os.system("%s -i ./taosdumptest/tmp" % binPath)
 
         tdSql.execute("use test")
         tdSql.query("show stables")
diff --git a/tests/pytest/tools/taosdumpTestNanoSupport.py b/tests/pytest/tools/taosdumpTestNanoSupport.py
index c40462b8db..2a3990614a 100644
--- a/tests/pytest/tools/taosdumpTestNanoSupport.py
+++ b/tests/pytest/tools/taosdumpTestNanoSupport.py
@@ -134,15 +134,15 @@ class TDTestCase:
         # dump all data
 
         os.system(
-            "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
+            "%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
             binPath)
 
         # dump part data with -S  -E
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000  -o ./taosdumptest/dumptmp2 ' %
+            '%s -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000  -o ./taosdumptest/dumptmp2 ' %
             binPath)
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000000  -o ./taosdumptest/dumptmp3  ' %
+            '%s -g --databases timedb1 -S 1625068810000000000  -o ./taosdumptest/dumptmp3  ' %
             binPath)
 
         tdSql.execute("drop database timedb1")
@@ -200,14 +200,14 @@ class TDTestCase:
         self.createdb(precision="us")
 
         os.system(
-            "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
+            "%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
             binPath)
 
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000 -E 1625068860000000  -o ./taosdumptest/dumptmp2 ' %
+            '%s -g --databases timedb1 -S 1625068810000000 -E 1625068860000000  -o ./taosdumptest/dumptmp2 ' %
             binPath)
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000  -o ./taosdumptest/dumptmp3  ' %
+            '%s -g --databases timedb1 -S 1625068810000000  -o ./taosdumptest/dumptmp3  ' %
             binPath)
 
         os.system("%s -i ./taosdumptest/dumptmp1" % binPath)
@@ -269,14 +269,14 @@ class TDTestCase:
         self.createdb(precision="ms")
 
         os.system(
-            "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
+            "%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
             binPath)
 
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000 -E 1625068860000  -o ./taosdumptest/dumptmp2 ' %
+            '%s -g --databases timedb1 -S 1625068810000 -E 1625068860000  -o ./taosdumptest/dumptmp2 ' %
             binPath)
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000  -o ./taosdumptest/dumptmp3  ' %
+            '%s -g --databases timedb1 -S 1625068810000  -o ./taosdumptest/dumptmp3  ' %
             binPath)
 
         os.system("%s -i ./taosdumptest/dumptmp1" % binPath)
-- 
GitLab