Skip to content

Commit 206e500

Browse files
committed
Fix test_os on Windows
1 parent d89fd46 commit 206e500

16 files changed

+99
-18
lines changed

Lib/test/test_os/test_dirfd.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@
44

55
import errno
66
import os
7-
import posix
87
import stat
98
import time
109
import unittest
1110
from contextlib import contextmanager
1211
from test import support
1312
from test.support import os_helper
1413

14+
try:
15+
import posix
16+
except ImportError:
17+
import nt as posix
18+
1519

1620
class TestPosixDirFd(unittest.TestCase):
1721
count = 0

Lib/test/test_os/test_dirs.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import errno
66
import itertools
77
import os
8-
import posix
98
import shutil
109
import stat
1110
import subprocess
@@ -16,6 +15,11 @@
1615
from test.support import os_helper
1716
from .utils import create_file
1817

18+
try:
19+
import posix
20+
except ImportError:
21+
import nt as posix
22+
1923

2024
class WalkTests(unittest.TestCase):
2125
"""Tests for os.walk()."""

Lib/test/test_os/test_encoding.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def test_bad_fd(self):
112112
(hasattr(locale, 'nl_langinfo') and hasattr(locale, 'CODESET'))),
113113
'test requires a tty and either Windows or nl_langinfo(CODESET)')
114114
def test_device_encoding(self):
115-
ncoding = os.device_encoding(0)
115+
encoding = os.device_encoding(0)
116116
self.assertIsNotNone(encoding)
117117
self.assertTrue(codecs.lookup(encoding))
118118

Lib/test/test_os/test_environ.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"""
44

55
import os
6-
import posix
76
import subprocess
87
import sys
98
import unittest
@@ -13,6 +12,11 @@
1312
from test.support import os_helper
1413
from test.support import unix_shell
1514

15+
try:
16+
import posix
17+
except ImportError:
18+
import nt as posix
19+
1620

1721
class EnvironTests(mapping_tests.BasicTestMappingProtocol):
1822
"""check that os.environ object conform to mapping protocol"""

Lib/test/test_os/test_fd.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import errno
66
import itertools
77
import os
8-
import posix
98
import select
109
import struct
1110
import sys
@@ -14,6 +13,11 @@
1413
from test import support
1514
from test.support import os_helper
1615

16+
try:
17+
import posix
18+
except ImportError:
19+
import nt as posix
20+
1721

1822
@unittest.skipIf(support.is_wasi, "Cannot create invalid FD on WASI.")
1923
class TestInvalidFD(unittest.TestCase):

Lib/test/test_os/test_file.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44

55
import errno
66
import os
7-
import posix
87
import sys
98
import unittest
109
from test import support
1110
from test.support import os_helper
1211
from .utils import create_file
1312

13+
try:
14+
import posix
15+
except ImportError:
16+
import nt as posix
17+
1418
try:
1519
import fcntl
1620
except ImportError:

Lib/test/test_os/test_file_attrs.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import fractions
88
import os
99
import platform
10-
import posix
1110
import stat
1211
import sys
1312
import tempfile
@@ -16,6 +15,11 @@
1615
from test.support import os_helper
1716
from .utils import create_file
1817

18+
try:
19+
import posix
20+
except ImportError:
21+
import nt as posix
22+
1923
try:
2024
import pwd
2125
all_users = [u.pw_uid for u in pwd.getpwall()]

Lib/test/test_os/test_link.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@
33
"""
44

55
import os
6-
import posix
76
import shutil
87
import sys
98
import unittest
109
from test.support import os_helper
1110
from test.support.os_helper import FakePath
1211
from .utils import create_file
1312

13+
try:
14+
import posix
15+
except ImportError:
16+
import nt as posix
17+
1418

1519
@unittest.skipUnless(hasattr(os, 'link'), 'requires os.link')
1620
class LinkTests(unittest.TestCase):

Lib/test/test_os/test_macos_weaklink.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@
22
Test macOS weak linking.
33
"""
44

5-
import os
6-
import posix
75
import sys
86
import unittest
7+
if sys.platform != "darwin":
8+
raise unittest.SkipTest("test weak linking on macOS")
9+
10+
import os
911
from test.support import os_helper
1012

13+
try:
14+
import posix
15+
except ImportError:
16+
import nt as posix
17+
1118

12-
@unittest.skipUnless(sys.platform == "darwin", "test weak linking on macOS")
1319
class TestPosixWeaklinking(unittest.TestCase):
1420
# These test cases verify that weak linking support on macOS works
1521
# as expected. These cases only test new behaviour introduced by weak linking,

Lib/test/test_os/test_process.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import errno
77
import os
88
import platform
9-
import posix
109
import signal
1110
import stat
1211
import subprocess
@@ -22,6 +21,10 @@
2221
from test.support.script_helper import assert_python_ok
2322
from .utils import requires_sched
2423

24+
try:
25+
import posix
26+
except ImportError:
27+
import nt as posix
2528
try:
2629
import _testcapi
2730
except ImportError:

0 commit comments

Comments
 (0)