[tests] fix last merge issues

parent 23e94a21
Pipeline #6974 passed with stages
in 57 minutes and 19 seconds