From 82d9baaec7443d03eb34b427431379260b3d1207 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 2 Dec 2024 16:41:37 -0600 Subject: [PATCH] Avoid redundant file/folder name Signed-off-by: Florent Poinsard --- .../s3_backup_endtoend_test.go => s3/s3_builtin_test.go} | 2 +- .../{backup_blackbox_race_test.go => backup_race_test.go} | 0 .../blackbox/{backup_blackbox_test.go => backup_test.go} | 0 test/config.json | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename go/test/endtoend/backup/{s3_builtin/s3_backup_endtoend_test.go => s3/s3_builtin_test.go} (99%) rename go/vt/mysqlctl/blackbox/{backup_blackbox_race_test.go => backup_race_test.go} (100%) rename go/vt/mysqlctl/blackbox/{backup_blackbox_test.go => backup_test.go} (100%) diff --git a/go/test/endtoend/backup/s3_builtin/s3_backup_endtoend_test.go b/go/test/endtoend/backup/s3/s3_builtin_test.go similarity index 99% rename from go/test/endtoend/backup/s3_builtin/s3_backup_endtoend_test.go rename to go/test/endtoend/backup/s3/s3_builtin_test.go index b58525b3702..e309197a708 100644 --- a/go/test/endtoend/backup/s3_builtin/s3_backup_endtoend_test.go +++ b/go/test/endtoend/backup/s3/s3_builtin_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package s3_builtin +package s3 import ( "context" diff --git a/go/vt/mysqlctl/blackbox/backup_blackbox_race_test.go b/go/vt/mysqlctl/blackbox/backup_race_test.go similarity index 100% rename from go/vt/mysqlctl/blackbox/backup_blackbox_race_test.go rename to go/vt/mysqlctl/blackbox/backup_race_test.go diff --git a/go/vt/mysqlctl/blackbox/backup_blackbox_test.go b/go/vt/mysqlctl/blackbox/backup_test.go similarity index 100% rename from go/vt/mysqlctl/blackbox/backup_blackbox_test.go rename to go/vt/mysqlctl/blackbox/backup_test.go diff --git a/test/config.json b/test/config.json index e07d25819a1..34c6bc1a6be 100644 --- a/test/config.json +++ b/test/config.json @@ -138,7 +138,7 @@ }, "backup_s3": { "File": "unused.go", - "Args": ["vitess.io/vitess/go/test/endtoend/backup/s3_builtin", "-timeout", "30m"], + "Args": ["vitess.io/vitess/go/test/endtoend/backup/s3", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "21",