Skip to content

Commit e8302b4

Browse files
committed
fix test
1 parent d5e1f41 commit e8302b4

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.github/workflows/encoding_mysql.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ jobs:
5353
5454
- name: Test mysql gbk support with new client
5555
run: |
56+
stat ${{steps.vars.outputs.MOUNT_POINT1}}
57+
[ $? -eq 0 ] && [ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT1}}` == 1 ] && ./juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT1}}
58+
stat ${{steps.vars.outputs.MOUNT_POINT2}}
59+
[ $? -eq 0 ] && [ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT2}}` == 1 ] && ./juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT2}}
5660
db_name=$(basename ${{steps.vars.outputs.META_URL1}})
5761
mysql -uroot -proot -e "drop database if exists $db_name; create database $db_name;"
5862
db_name=$(basename ${{steps.vars.outputs.META_URL2}})
@@ -111,8 +115,8 @@ jobs:
111115
./juicefs umount ${{steps.vars.outputs.MOUNT_POINT2}}
112116
- name: Test remount with new client after alter db to binary
113117
run: |
114-
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT1}}` == 1 ] || juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT1}} || exit 1
115-
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT2}}` == 1 ] || juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT2}} || exit 1
118+
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT1}}` == 1 ] && ./juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT1}}
119+
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT2}}` == 1 ] && ./juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT2}}
116120
db_name=$(basename ${{steps.vars.outputs.META_URL1}})
117121
mysql -uroot -proot -e "drop database if exists $db_name; create database $db_name;"
118122
db_name=$(basename ${{steps.vars.outputs.META_URL2}})
@@ -181,8 +185,8 @@ jobs:
181185
./juicefs umount ${{steps.vars.outputs.MOUNT_POINT1}}
182186
- name: Test mount old meta using new client without db change
183187
run: |
184-
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT1}}` == 1 ] || juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT1}} || exit 1
185-
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT2}}` == 1 ] || juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT2}} || exit 1
188+
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT1}}` == 1 ] && ./juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT1}}
189+
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT2}}` == 1 ] && ./juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT2}}
186190
db_name=$(basename ${{steps.vars.outputs.META_URL1}})
187191
mysql -uroot -proot -e "drop database if exists $db_name; create database $db_name;"
188192
db_name=$(basename ${{steps.vars.outputs.META_URL2}})
@@ -212,8 +216,8 @@ jobs:
212216
./juicefs umount ${{steps.vars.outputs.MOUNT_POINT1}}
213217
- name: Test dump with old client and load with new client
214218
run: |
215-
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT1}}` == 1 ] || juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT1}} || exit 1
216-
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT2}}` == 1 ] || juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT2}} || exit 1
219+
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT1}}` == 1 ] && ./juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT1}}
220+
[ `stat -c %i ${{steps.vars.outputs.MOUNT_POINT2}}` == 1 ] && ./juicefs umount -f ${{steps.vars.outputs.MOUNT_POINT2}}
217221
db_name=$(basename ${{steps.vars.outputs.META_URL1}})
218222
mysql -uroot -proot -e "drop database if exists $db_name; create database $db_name;"
219223
db_name=$(basename ${{steps.vars.outputs.META_URL2}})

0 commit comments

Comments
 (0)