test配置调整
Merge branch 'v1.2'