CurOpFailpointHelpers::waitWhileFailPointEnabled() here takes a checkForInterrupt argument that is set to false by default. It is set to true in a small handful of cases. It also has the ability take a "shouldCheckForInterrupt" data field (see here) that can be set on a test by test basis.

I believe that CurOpFailpointHelpers::waitWhileFailPointEnabled() should not have this argument and should instead have a consistent default that can be overridden by the "shouldCheckForInterrupt" field. I could see arguments either way for it defaulting to "true" or "false". Either way, some tests will now need to set "shouldCheckForInterrupt", probably based on whether they include intentional interruptions (like sharding/killop.js).