Commit e81e355a authored by Victor Stinner's avatar Victor Stinner Committed by GitHub

bpo-30108: Fix test_site setUpModule() (#1460)

Oops, I forgot that PermissionError was introduced in Python 3.3!
Replace PermissionError with OSError and check on errno.
parent 78064387
...@@ -8,6 +8,7 @@ import unittest ...@@ -8,6 +8,7 @@ import unittest
from test.test_support import run_unittest, TESTFN, EnvironmentVarGuard from test.test_support import run_unittest, TESTFN, EnvironmentVarGuard
from test.test_support import captured_output from test.test_support import captured_output
import __builtin__ import __builtin__
import errno
import os import os
import sys import sys
import re import re
...@@ -38,9 +39,12 @@ def setUpModule(): ...@@ -38,9 +39,12 @@ def setUpModule():
os.makedirs(site.USER_SITE) os.makedirs(site.USER_SITE)
# modify sys.path: will be restored by tearDownModule() # modify sys.path: will be restored by tearDownModule()
site.addsitedir(site.USER_SITE) site.addsitedir(site.USER_SITE)
except PermissionError as exc: except OSError as exc:
raise unittest.SkipTest('unable to create user site directory (%r): %s' if exc.errno in (errno.EACCES, errno.EPERM):
% (site.USER_SITE, exc)) raise unittest.SkipTest('unable to create user site directory (%r): %s'
% (site.USER_SITE, exc))
else:
raise
def tearDownModule(): def tearDownModule():
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment