integration: fix possible early fire in TestWatch
Merge pull request #1860 from yichengq/249

integration: fix possible early fire in TestWatch