This fixes a bunch of cases where a timeout in the test would leak a goroutine.
Attach a file by drag & drop or click to upload
