(original) (raw)

changeset: 77598:04fd8f77a58e user: Larry Hastings larry@hastings.org date: Fri Jun 22 17:01:41 2012 -0700 files: Lib/test/test_posix.py Lib/test/test_shutil.py description: Issue #14626: Fix buildbot issues on FreeBSD (AMD64). (Fingers crossed.) diff -r 27f9c26fdd8b -r 04fd8f77a58e Lib/test/test_posix.py --- a/Lib/test/test_posix.py Fri Jun 22 16:30:09 2012 -0700 +++ b/Lib/test/test_posix.py Fri Jun 22 17:01:41 2012 -0700 @@ -721,8 +721,13 @@ posix.utime(support.TESTFN, dir_fd=f, times=(int(now), int((now - int(now)) * 1e9))) + # try dir_fd and follow_symlinks together if os.utime in os.supports_follow_symlinks: - posix.utime(support.TESTFN, follow_symlinks=False, dir_fd=f) + try: + posix.utime(support.TESTFN, follow_symlinks=False, dir_fd=f) + except RuntimeError: + # whoops! using both together not supported on this platform. + pass finally: posix.close(f) diff -r 27f9c26fdd8b -r 04fd8f77a58e Lib/test/test_shutil.py --- a/Lib/test/test_shutil.py Fri Jun 22 16:30:09 2012 -0700 +++ b/Lib/test/test_shutil.py Fri Jun 22 17:01:41 2012 -0700 @@ -296,7 +296,7 @@ def make_chflags_raiser(err): ex = OSError() - def _chflags_raiser(path, flags): + def _chflags_raiser(path, flags, *, follow_symlinks=True): ex.errno = err raise ex return _chflags_raiser /larry@hastings.org