Skip to content

Commit c88bd15

Browse files
zhuizhuhaomengzhuizhuhaomeng
committed
bugfix: fixed mysql issue.
1 parent 271f5be commit c88bd15

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

‎samples/ortest-ec2.ob‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,8 @@ postgres {
11181118

11191119
run-mysql {
11201120
running 'mariadbd --';
1121+
sh 'sudo docker stop mysqld';
1122+
sh 'sudo docker rm mysqld';
11211123
sh 'sudo systemctl start mariadb';
11221124
dep mysql;
11231125
}
@@ -3212,8 +3214,8 @@ t-lua-resty-mysql {
32123214
env TEST_NGINX_REDIS_PORT '';
32133215

32143216
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
3215-
env TEST_NGINX_MYSQL_PORT 3307;
32163217
env DB_VERSION mariadb:10.3;
3218+
sh 'sudo systemctl stop mariadb';
32173219
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
32183220
env TEST_NGINX_EVENT_TYPE '';
32193221
env MOCKEAGAIN '';
@@ -6055,8 +6057,8 @@ tv-lua-resty-mysql {
60556057
env TEST_NGINX_REDIS_PORT '';
60566058

60576059
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
6058-
env TEST_NGINX_MYSQL_PORT 3307;
60596060
env DB_VERSION mariadb:10.3;
6061+
sh 'sudo systemctl stop mariadb';
60606062
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
60616063
env TEST_NGINX_EVENT_TYPE '';
60626064
env MOCKEAGAIN '';
@@ -8427,8 +8429,8 @@ tr-lua-resty-mysql {
84278429
env TEST_NGINX_REDIS_PORT '';
84288430

84298431
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
8430-
env TEST_NGINX_MYSQL_PORT 3307;
84318432
env DB_VERSION mariadb:10.3;
8433+
sh 'sudo systemctl stop mariadb';
84328434
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
84338435
env TEST_NGINX_EVENT_TYPE '';
84348436
env MOCKEAGAIN '';
@@ -10897,8 +10899,8 @@ trv-lua-resty-mysql {
1089710899
env TEST_NGINX_REDIS_PORT '';
1089810900

1089910901
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
10900-
env TEST_NGINX_MYSQL_PORT 3307;
1090110902
env DB_VERSION mariadb:10.3;
10903+
sh 'sudo systemctl stop mariadb';
1090210904
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
1090310905
env TEST_NGINX_EVENT_TYPE '';
1090410906
env MOCKEAGAIN '';
@@ -13365,8 +13367,8 @@ tw-lua-resty-mysql {
1336513367
env TEST_NGINX_REDIS_PORT '';
1336613368

1336713369
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
13368-
env TEST_NGINX_MYSQL_PORT 3307;
1336913370
env DB_VERSION mariadb:10.3;
13371+
sh 'sudo systemctl stop mariadb';
1337013372
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
1337113373
env TEST_NGINX_EVENT_TYPE '';
1337213374
env MOCKEAGAIN '';
@@ -15866,8 +15868,8 @@ twv-lua-resty-mysql {
1586615868
env TEST_NGINX_REDIS_PORT '';
1586715869

1586815870
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
15869-
env TEST_NGINX_MYSQL_PORT 3307;
1587015871
env DB_VERSION mariadb:10.3;
15872+
sh 'sudo systemctl stop mariadb';
1587115873
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
1587215874
env TEST_NGINX_EVENT_TYPE '';
1587315875
env MOCKEAGAIN '';
@@ -18727,8 +18729,8 @@ th-lua-resty-mysql {
1872718729
env TEST_NGINX_REDIS_PORT '';
1872818730

1872918731
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
18730-
env TEST_NGINX_MYSQL_PORT 3307;
1873118732
env DB_VERSION mariadb:10.3;
18733+
sh 'sudo systemctl stop mariadb';
1873218734
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
1873318735
env TEST_NGINX_EVENT_TYPE '';
1873418736
env MOCKEAGAIN '';
@@ -21532,8 +21534,8 @@ thv-lua-resty-mysql {
2153221534
env TEST_NGINX_REDIS_PORT '';
2153321535

2153421536
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
21535-
env TEST_NGINX_MYSQL_PORT 3307;
2153621537
env DB_VERSION mariadb:10.3;
21538+
sh 'sudo systemctl stop mariadb';
2153721539
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
2153821540
env TEST_NGINX_EVENT_TYPE '';
2153921541
env MOCKEAGAIN '';
@@ -24339,8 +24341,8 @@ tl-lua-resty-mysql {
2433924341
env TEST_NGINX_REDIS_PORT '';
2434024342

2434124343
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
24342-
env TEST_NGINX_MYSQL_PORT 3307;
2434324344
env DB_VERSION mariadb:10.3;
24345+
sh 'sudo systemctl stop mariadb';
2434424346
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
2434524347
env TEST_NGINX_EVENT_TYPE '';
2434624348
env MOCKEAGAIN '';
@@ -27095,8 +27097,8 @@ to-lua-resty-mysql {
2709527097
env TEST_NGINX_REDIS_PORT '';
2709627098

2709727099
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
27098-
env TEST_NGINX_MYSQL_PORT 3307;
2709927100
env DB_VERSION mariadb:10.3;
27101+
sh 'sudo systemctl stop mariadb';
2710027102
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
2710127103
env TEST_NGINX_EVENT_TYPE '';
2710227104
env MOCKEAGAIN '';

‎samples/ortest-ec2.ob.tt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ luajit-git {
260260

261261
[%- IF name == "lua-resty-mysql" %]
262262
env TEST_NGINX_MYSQL_PATH /var/run/mysqld/mysqld.sock;
263-
env TEST_NGINX_MYSQL_PORT 3307;
264263
env DB_VERSION mariadb:10.3;
264+
sh 'sudo systemctl stop mariadb';
265265
sh 'cd ~/git/lua-resty-mysql && ./.travis/initializedb.sh';
266266
[%- ELSIF name == "lua-resty-redis" -%]
267267
dep ngx-lua-tests-firewall-rules;
@@ -877,6 +877,8 @@ postgres {
877877

878878
run-mysql {
879879
running 'mariadbd --';
880+
sh 'sudo docker stop mysqld';
881+
sh 'sudo docker rm mysqld';
880882
sh 'sudo systemctl start mariadb';
881883
dep mysql;
882884
}

0 commit comments

Comments
 (0)