Auto merge of #6267 - ehuss:fix-fix_path_deps-again, r=alexcrichton
Auto merge of #6267 - ehuss:fix-fix_path_deps-again, r=alexcrichton

Fix fix_path_deps again.

The previous fix in #6236 wasn't enough to make this test not fail. On Travis MacOS it fails about 5% of the time. Essentially the first "FIXING" line is sometimes delayed until after the second "CHECKING" line. The "FIXING" message is sent async to the diagnostic server, so I think it's just a race that doesn't have a good way to enforce.  Oddly, I can only repro this on Travis.

Error seen at:
https://travis-ci.org/rust-lang/cargo/jobs/450956693

rust-lang/cargo,vojtechkral/cargo,tshepang/cargo,tsurai/cargo,rustyhorde/cargo,eminence/cargo,rustyhorde/cargo,nipunn1313/cargo,rust-lang/cargo,rust-lang/cargo,rustyhorde/cargo,rustyhorde/cargo,tshepang/cargo,eminence/cargo,vojtechkral/cargo,vojtechkral/cargo,tshepang/cargo,tshepang/cargo,nipunn1313/cargo,tsurai/cargo,vojtechkral/cargo,tsurai/cargo,tsurai/cargo,tsurai/cargo,nipunn1313/cargo,rust-lang/cargo,eminence/cargo,nipunn1313/cargo,eminence/cargo