From d31bb855c8c70ff74d58459e2134234fab0f2fef Mon Sep 17 00:00:00 2001 From: Giuseppe Maxia Date: Mon, 5 Sep 2022 05:31:24 +0200 Subject: [PATCH] Remove menagerie from data-load tests Not all MySQL downloads include `mysqlimport`, which is needed to install the menagerie database --- ts/templates/feature/data-load-single.tmpl | 14 -------------- .../replication/replication-gtid.tmpl | 19 ------------------- 2 files changed, 33 deletions(-) diff --git a/ts/templates/feature/data-load-single.tmpl b/ts/templates/feature/data-load-single.tmpl index b98473b..7789404 100644 --- a/ts/templates/feature/data-load-single.tmpl +++ b/ts/templates/feature/data-load-single.tmpl @@ -41,15 +41,6 @@ stdout 'world\s+93 kB world database' stdout 'worldx\s+99 kB world_X database' stdout 'sakila\s+732 kB Sakila database' -# load data menagerie - -exec dbdeployer data-load get menagerie msb_{{.DbPathVer}}_dataload -stdout 'downloading https://.*/menagerie-db.tar.gz' -stdout 'Unpacking .*/sandboxes/msb_{{.DbPathVer}}_dataload/menagerie-db.tar.gz' -stdout 'Running .*/sandboxes/msb_{{.DbPathVer}}_dataload/load_db.sh' -stdout 'menagerie.pet: Records: 8 Deleted: 0 Skipped: 0' -stdout 'menagerie.event: Records: 10 Deleted: 0 Skipped: 0' - # load data world exec dbdeployer data-load get world msb_{{.DbPathVer}}_dataload @@ -74,17 +65,12 @@ stdout 'Running .*/sandboxes/msb_{{.DbPathVer}}_dataload/load_db.sh' # load data check schemas exec $sb_dir/use -e 'show schemas' -stdout 'menagerie' stdout 'world\b' stdout 'world_x' stdout 'sakila' # load data check tables -exec $sb_dir/use -e 'show tables from menagerie' -stdout 'event' -stdout 'pet' - exec $sb_dir/use -e 'show tables from world' stdout 'city' stdout 'country' diff --git a/ts/templates/replication/replication-gtid.tmpl b/ts/templates/replication/replication-gtid.tmpl index 7d8836f..85a1c45 100644 --- a/ts/templates/replication/replication-gtid.tmpl +++ b/ts/templates/replication/replication-gtid.tmpl @@ -78,15 +78,6 @@ stdout 'world\s+93 kB world database' stdout 'worldx\s+99 kB world_X database' stdout 'sakila\s+732 kB Sakila database' -# load data menagerie - -exec dbdeployer data-load get menagerie rsandbox_{{.DbPathVer}}_gtid -stdout 'downloading https://.*/menagerie-db.tar.gz' -stdout 'Unpacking .*/sandboxes/rsandbox_{{.DbPathVer}}_gtid/menagerie-db.tar.gz' -stdout 'Running .*/sandboxes/rsandbox_{{.DbPathVer}}_gtid/load_db.sh' -stdout 'menagerie.pet: Records: 8 Deleted: 0 Skipped: 0' -stdout 'menagerie.event: Records: 10 Deleted: 0 Skipped: 0' - # load data world exec dbdeployer data-load get world rsandbox_{{.DbPathVer}}_gtid @@ -111,27 +102,17 @@ stdout 'Running .*/sandboxes/rsandbox_{{.DbPathVer}}_gtid/load_db.sh' # load data check schemas exec $sb_dir/m -e 'show schemas' -stdout 'menagerie' stdout 'world\b' stdout 'world_x' stdout 'sakila' exec $sb_dir/s1 -e 'show schemas' -stdout 'menagerie' stdout 'world\b' stdout 'world_x' stdout 'sakila' # load data check tables -exec $sb_dir/m -e 'show tables from menagerie' -stdout 'event' -stdout 'pet' - -exec $sb_dir/s1 -e 'show tables from menagerie' -stdout 'event' -stdout 'pet' - exec $sb_dir/m -e 'show tables from world' stdout 'city' stdout 'country'