Skip to content

Commit

Permalink
pythongh-25177: fix bad rebase of moved test file
Browse files Browse the repository at this point in the history
During the process of merging in a year and a half of changes, the
modified test file `test_loading.py` accidentally got converted to a
newly added file in an old location, rather than an existing test file
with an updated test.

Merge the changes in this file into the new canonical location since
pythongh-93839, and delete the old file.
  • Loading branch information
eli-schwartz committed Dec 22, 2022
1 parent 3c033a2 commit 1ff6ee3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 188 deletions.
188 changes: 0 additions & 188 deletions Lib/ctypes/test/test_loading.py

This file was deleted.

6 changes: 6 additions & 0 deletions Lib/test/test_ctypes/test_loading.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ def test_1703286_B(self):
# This is the real test: call the function via 'call_function'
self.assertEqual(0, call_function(proc, (None,)))

@unittest.skipUnless(os.name == "nt",
'test specific to Windows')
def test_load_hasattr(self):
# bpo-34816: shouldn't raise OSError
self.assertFalse(hasattr(windll, 'test'))

@unittest.skipUnless(os.name == "nt",
'test specific to Windows')
def test_load_dll_with_flags(self):
Expand Down

0 comments on commit 1ff6ee3

Please sign in to comment.