Merge pull request #262760 from gador/todoman-fix-test
todoman: apply upstream patch
authored by Weijia Wang and committed by GitHub 2 years ago a944b73a 7f4904bd