revert change of integration test

pingcap · Dec 21, 2020 · db85f8f · db85f8f
1 parent 3f2a346
commit db85f8f
Show file tree

Hide file tree

Showing 30 changed files with 37 additions and 37 deletions.
diff --git a/chaos/cases/conf/source1.yaml b/chaos/cases/conf/source1.yaml
@@ -1,6 +1,6 @@
 source-id: "mysql-replica-01"
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 
 from:
   host: "mysql-0.mysql" # same namespace with MySQL

diff --git a/tests/all_mode/conf/source2.yaml b/tests/all_mode/conf/source2.yaml
@@ -3,7 +3,7 @@
 source-id: mysql-replica-02
 flavor: ''
 enable-gtid: true
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/compatibility/conf/source1.yaml b/tests/compatibility/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/compatibility/start.sh b/tests/compatibility/start.sh
@@ -68,7 +68,7 @@ function run() {
 
     run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     echo "use sync_diff_inspector to check data second time"
     check_sync_diff $WORK_DIR $cur/conf/diff_config.toml

diff --git a/tests/dm_syncer/conf/source1.yaml b/tests/dm_syncer/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/dmctl_basic/conf/get_source1.yaml b/tests/dmctl_basic/conf/get_source1.yaml
@@ -4,7 +4,7 @@ relay-dir: /tmp/dm_test/dmctl_basic/worker1/relay_log
 meta-dir: ""
 flavor: mysql
 charset: ""
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ""
 relay-binlog-gtid: ""
 source-id: mysql-replica-01

diff --git a/tests/dmctl_basic/conf/source1.yaml b/tests/dmctl_basic/conf/source1.yaml
@@ -3,7 +3,7 @@ server-id: 123456
 enable-gtid: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
-enable-relay: true
+enable-relay: false
 from:
   host: 127.0.0.1
   user: root

diff --git a/tests/dmctl_command/conf/source1.yaml b/tests/dmctl_command/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/full_mode/conf/source1.yaml b/tests/full_mode/conf/source1.yaml
@@ -2,7 +2,7 @@ server-id: 101
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/full_mode/run.sh b/tests/full_mode/run.sh
@@ -52,7 +52,7 @@ function fail_acquire_global_lock() {
 
     run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
         "query-status test" \
-        "\"stage\": \"Paused\"" 4 \
+        "\"stage\": \"Paused\"" 3 \
         "you need (at least one of) the RELOAD privilege(s) for this operation" 2
 
     cleanup_data full_mode

diff --git a/tests/ha/conf/source1.yaml b/tests/ha/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: true
-enable-relay: true
+enable-relay: false
 from:
   host: 127.0.0.1
   user: root

diff --git a/tests/ha/run.sh b/tests/ha/run.sh
@@ -91,22 +91,22 @@ function run() {
     echo "query-status from all dm-master"
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT1" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT2" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT3" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     echo "join new dm-master and query-status"
     run_dm_master $WORK_DIR/master4 $MASTER_PORT4 $cur/conf/dm-master4.toml
     check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT4
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT4" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     # may join failed with error `fail to join embed etcd: add member http://127.0.0.1:8295: etcdserver: unhealthy cluster`, and dm-master will exit. so just sleep some seconds.
     sleep 5
@@ -115,14 +115,14 @@ function run() {
     check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT5
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT5" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
     sleep 5
 
     run_dm_master $WORK_DIR/master6 $MASTER_PORT6 $cur/conf/dm-master6.toml
     check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT6
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT6" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
     sleep 5
 
     echo "kill dm-master1"

diff --git a/tests/ha_master/conf/source1.yaml b/tests/ha_master/conf/source1.yaml
@@ -3,7 +3,7 @@ flavor: ''
 enable-gtid: true
 relay-binlog-name: ''
 relay-binlog-gtid: ''
-enable-relay: true
+enable-relay: false
 from:
   host: 127.0.0.1
   user: root

diff --git a/tests/ha_master/run.sh b/tests/ha_master/run.sh
@@ -327,7 +327,7 @@ function run() {
     check_http_alive 127.0.0.1:$MASTER_PORT3/apis/${API_VERSION}/status/test '"stage": "Running"' 10
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT3" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     run_sql_file $cur/data/db1.increment.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1
     run_sql_file $cur/data/db2.increment.sql $MYSQL_HOST2 $MYSQL_PORT2 $MYSQL_PASSWORD2
@@ -351,7 +351,7 @@ function run() {
     # the last two masters should elect a new leader and serve service
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT4" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     # run master3 again
     run_dm_master $WORK_DIR/master3 $MASTER_PORT3 $cur/conf/dm-master3.toml

diff --git a/tests/import_v10x/conf/source1.yaml b/tests/import_v10x/conf/source1.yaml
@@ -3,7 +3,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 from:
   host: 127.0.0.1
   user: root

diff --git a/tests/import_v10x/run.sh b/tests/import_v10x/run.sh
@@ -71,7 +71,7 @@ function run() {
     # check task running.
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     # check task config, just a simple match
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \

diff --git a/tests/incremental_mode/conf/source1.yaml b/tests/incremental_mode/conf/source1.yaml
@@ -3,7 +3,7 @@ flavor: ''
 enable-gtid: true
 relay-binlog-name: ''
 relay-binlog-gtid: ''
-enable-relay: true
+enable-relay: false
 from:
   host: 127.0.0.1
   user: root

diff --git a/tests/incremental_mode/run.sh b/tests/incremental_mode/run.sh
@@ -110,7 +110,7 @@ function run() {
 
     run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
         "query-status test" \
-        "Running" 4
+        "Running" 3
     # we use failpoint to let worker sleep 8 second when executeSQLs, to increase possibility of
     # meeting an error of context cancel.
     # when below check pass, it means we filter out that error, or that error doesn't happen.

diff --git a/tests/online_ddl/conf/source1.yaml b/tests/online_ddl/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: true
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/online_ddl/run.sh b/tests/online_ddl/run.sh
@@ -52,7 +52,7 @@ function real_run() {
     echo "wait and check task running"
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     run_sql_file $cur/data/db1.increment2.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1
     run_sql_file $cur/data/db2.increment2.sql $MYSQL_HOST2 $MYSQL_PORT2 $MYSQL_PASSWORD2

diff --git a/tests/safe_mode/conf/source2.yaml b/tests/safe_mode/conf/source2.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-02
 flavor: ''
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/sequence_safe_mode/conf/source1.yaml b/tests/sequence_safe_mode/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: true
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/sequence_sharding/conf/source2.yaml b/tests/sequence_sharding/conf/source2.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-02
 flavor: ''
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/sequence_sharding_optimistic/conf/source1.yaml b/tests/sequence_sharding_optimistic/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/sequence_sharding_optimistic/run.sh b/tests/sequence_sharding_optimistic/run.sh
@@ -74,7 +74,7 @@ run() {
         "\"result\": true" 3
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
         "query-status $task_name" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     # now, for optimistic shard DDL, different sources will reach a stage often not at the same time,
     # in order to simply the check and resume flow, only enable the failpoint for one DM-worker.
@@ -198,7 +198,7 @@ run() {
         "\"result\": true" 3
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
         "query-status $task_name" \
-        "\"stage\": \"Running\"" 4
+        "\"stage\": \"Running\"" 3
 
     # use sync_diff_inspector to check data now!
     check_sync_diff $WORK_DIR $cur/conf/diff_config.toml

diff --git a/tests/sequence_sharding_removemeta/conf/source1.yaml b/tests/sequence_sharding_removemeta/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: true
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/sharding/conf/source1.yaml b/tests/sharding/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: true
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/sharding2/conf/source1.yaml b/tests/sharding2/conf/source1.yaml
@@ -1,7 +1,7 @@
 source-id: mysql-replica-01
 flavor: ''
 enable-gtid: true
-enable-relay: true
+enable-relay: false
 relay-binlog-name: ''
 relay-binlog-gtid: ''
 from:

diff --git a/tests/sharding2/run.sh b/tests/sharding2/run.sh
@@ -81,7 +81,7 @@ function run() {
 
     run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
         "query-status test" \
-        "\"stage\": \"Running\"" 4 \
+        "\"stage\": \"Running\"" 3 \
         "\"unit\": \"Sync\"" 2
 }
 

diff --git a/tests/tiup/conf/source1.yaml b/tests/tiup/conf/source1.yaml
@@ -1,6 +1,6 @@
 source-id: mysql-replica-01
 enable-gtid: false
-enable-relay: true
+enable-relay: false
 from:
   host: mysql1
   user: root