resolve conflicts

Signed-off-by: Jianjun Liao <[email protected]>

br/tests/br_pitr/run.sh

@@ -100,7 +100,6 @@ restart_services
 echo "run pitr"
 run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" > $res_file 2>&1
 
-<<<<<<< HEAD
 # check something in downstream cluster
 echo "check br log"
 check_contains "restore log success summary"
@@ -115,35 +114,6 @@ expect_delete_range=$(($incremental_delete_range_count-$prepare_delete_range_cou
 check_contains "DELETE_RANGE_CNT: $expect_delete_range"
 ## check feature compatibility between PITR and accelerate indexing
 bash $CUR/check/check_ingest_repair.sh
-=======
-check_result
-
-# start a new cluster for incremental + log
-echo "restart a services"
-restart_services
-
-echo "run snapshot restore#2"
-run_br --pd $PD_ADDR restore full -s "local://$TEST_DIR/$PREFIX/full" 
-
-echo "run incremental restore + log restore"
-run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/inc" > $res_file 2>&1
-
-check_result
-
-# start a new cluster for incremental + log
-echo "restart a services"
-restart_services
-
-echo "run snapshot restore#3"
-run_br --pd $PD_ADDR restore full -s "local://$TEST_DIR/$PREFIX/full" 
-
-echo "run incremental restore but failed"
-restore_fail=0
-run_br --pd $PD_ADDR restore full -s "local://$TEST_DIR/$PREFIX/inc_fail" || restore_fail=1
-if [ $restore_fail -ne 1 ]; then
-    echo 'pitr success' 
-    exit 1
-fi
 
 # start a new cluster for corruption
 echo "restart a services"
@@ -178,4 +148,3 @@ if [ $restore_fail -ne 1 ]; then
     echo 'pitr success' 
     exit 1
 fi
->>>>>>> 5399ca70da9 (br: fix br integration test (#53836))

br/tests/run_group.sh

@@ -28,7 +28,7 @@ groups=(
 	["G05"]='br_range br_rawkv br_replica_read br_restore_TDE_enable br_restore_log_task_enable br_s3 br_shuffle_leader br_shuffle_region br_single_table'
 	["G06"]='br_skip_checksum br_small_batch_size br_split_region_fail br_systables br_table_filter br_txn br_stats'
 	["G07"]='br_clustered_index br_crypter br_table_partition br_tidb_placement_policy br_tiflash br_tikv_outage'
-	["G08"]='br_tikv_outage2 br_ttl br_views_and_sequences br_z_gc_safepoint br_autorandom lightning_add_index lightning_alter_random lightning_auto_columns'
+	["G08"]='br_tikv_outage2 br_ttl br_views_and_sequences br_z_gc_safepoint br_autorandom br_file_corruption lightning_add_index lightning_alter_random lightning_auto_columns'
 	["G09"]='lightning_auto_random_default lightning_bom_file lightning_character_sets lightning_check_partial_imported lightning_checkpoint lightning_checkpoint_chunks lightning_checkpoint_columns lightning_checkpoint_dirty_tableid'
 	["G10"]='lightning_checkpoint_engines lightning_checkpoint_engines_order lightning_checkpoint_error_destroy lightning_checkpoint_parquet lightning_checkpoint_timestamp lightning_checksum_mismatch lightning_cmdline_override lightning_column_permutation lightning_common_handle'
 	["G11"]='lightning_compress lightning_concurrent-restore lightning_config_max_error lightning_config_skip_csv_header lightning_csv lightning_default-columns lightning_disable_scheduler_by_key_range lightning_disk_quota lightning_distributed_import'