Backport robustness fix for test_builtin
1 file changed