summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2012-06-23 00:01:41 (GMT)
committerLarry Hastings <larry@hastings.org>2012-06-23 00:01:41 (GMT)
commit90867a5abab7fc866e4cb392c34242b49ea45258 (patch)
treed3679e78a6967d5e2773680beab879b25a1e7e39
parent9cf065cfdc4245ea7e31edcb2e6ede0cea47d148 (diff)
downloadcpython-90867a5abab7fc866e4cb392c34242b49ea45258.zip
cpython-90867a5abab7fc866e4cb392c34242b49ea45258.tar.gz
cpython-90867a5abab7fc866e4cb392c34242b49ea45258.tar.bz2
Issue #14626: Fix buildbot issues on FreeBSD (AMD64). (Fingers crossed.)
-rw-r--r--Lib/test/test_posix.py7
-rw-r--r--Lib/test/test_shutil.py2
2 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index ffa58ee..a9b13e2 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -721,8 +721,13 @@ class PosixTester(unittest.TestCase):
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 --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index ad835ae..1929237 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -296,7 +296,7 @@ class TestShutil(unittest.TestCase):
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