Skip to content
This repository was archived by the owner on Oct 29, 2023. It is now read-only.

Commit d31bb85

Browse files
committed
Remove menagerie from data-load tests
Not all MySQL downloads include `mysqlimport`, which is needed to install the menagerie database
1 parent f9d9324 commit d31bb85

File tree

2 files changed

+0
-33
lines changed

2 files changed

+0
-33
lines changed

ts/templates/feature/data-load-single.tmpl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,6 @@ stdout 'world\s+93 kB world database'
4141
stdout 'worldx\s+99 kB world_X database'
4242
stdout 'sakila\s+732 kB Sakila database'
4343

44-
# load data menagerie
45-
46-
exec dbdeployer data-load get menagerie msb_{{.DbPathVer}}_dataload
47-
stdout 'downloading https://.*/menagerie-db.tar.gz'
48-
stdout 'Unpacking .*/sandboxes/msb_{{.DbPathVer}}_dataload/menagerie-db.tar.gz'
49-
stdout 'Running .*/sandboxes/msb_{{.DbPathVer}}_dataload/load_db.sh'
50-
stdout 'menagerie.pet: Records: 8 Deleted: 0 Skipped: 0'
51-
stdout 'menagerie.event: Records: 10 Deleted: 0 Skipped: 0'
52-
5344
# load data world
5445

5546
exec dbdeployer data-load get world msb_{{.DbPathVer}}_dataload
@@ -74,17 +65,12 @@ stdout 'Running .*/sandboxes/msb_{{.DbPathVer}}_dataload/load_db.sh'
7465
# load data check schemas
7566

7667
exec $sb_dir/use -e 'show schemas'
77-
stdout 'menagerie'
7868
stdout 'world\b'
7969
stdout 'world_x'
8070
stdout 'sakila'
8171

8272
# load data check tables
8373

84-
exec $sb_dir/use -e 'show tables from menagerie'
85-
stdout 'event'
86-
stdout 'pet'
87-
8874
exec $sb_dir/use -e 'show tables from world'
8975
stdout 'city'
9076
stdout 'country'

ts/templates/replication/replication-gtid.tmpl

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ stdout 'world\s+93 kB world database'
7878
stdout 'worldx\s+99 kB world_X database'
7979
stdout 'sakila\s+732 kB Sakila database'
8080

81-
# load data menagerie
82-
83-
exec dbdeployer data-load get menagerie rsandbox_{{.DbPathVer}}_gtid
84-
stdout 'downloading https://.*/menagerie-db.tar.gz'
85-
stdout 'Unpacking .*/sandboxes/rsandbox_{{.DbPathVer}}_gtid/menagerie-db.tar.gz'
86-
stdout 'Running .*/sandboxes/rsandbox_{{.DbPathVer}}_gtid/load_db.sh'
87-
stdout 'menagerie.pet: Records: 8 Deleted: 0 Skipped: 0'
88-
stdout 'menagerie.event: Records: 10 Deleted: 0 Skipped: 0'
89-
9081
# load data world
9182

9283
exec dbdeployer data-load get world rsandbox_{{.DbPathVer}}_gtid
@@ -111,27 +102,17 @@ stdout 'Running .*/sandboxes/rsandbox_{{.DbPathVer}}_gtid/load_db.sh'
111102
# load data check schemas
112103

113104
exec $sb_dir/m -e 'show schemas'
114-
stdout 'menagerie'
115105
stdout 'world\b'
116106
stdout 'world_x'
117107
stdout 'sakila'
118108

119109
exec $sb_dir/s1 -e 'show schemas'
120-
stdout 'menagerie'
121110
stdout 'world\b'
122111
stdout 'world_x'
123112
stdout 'sakila'
124113

125114
# load data check tables
126115

127-
exec $sb_dir/m -e 'show tables from menagerie'
128-
stdout 'event'
129-
stdout 'pet'
130-
131-
exec $sb_dir/s1 -e 'show tables from menagerie'
132-
stdout 'event'
133-
stdout 'pet'
134-
135116
exec $sb_dir/m -e 'show tables from world'
136117
stdout 'city'
137118
stdout 'country'

0 commit comments

Comments
 (0)