merge r58023 to fix issue1112 on windows.  make this test more robust
and deterministic.
1 file changed