fix: fix waiting bypass logic and add test.

fix: fix waiting bypass logic and add test. #3160