Skip to content

[3.6] bpo-34200: Fix non-determinism of test_pkg (GH-9248) #9253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Sep 13, 2018
Merged

[3.6] bpo-34200: Fix non-determinism of test_pkg (GH-9248) #9253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Lib/test/test_pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import tempfile
import textwrap
import unittest
from test import support


# Helpers to create and destroy hierarchies.
Expand Down Expand Up @@ -50,11 +49,13 @@ def setUp(self):
self.root = None
self.pkgname = None
self.syspath = list(sys.path)
self.modules_before = support.modules_setup()
self.modules_to_cleanup = set() # Populated by mkhier().

def tearDown(self):
sys.path[:] = self.syspath
support.modules_cleanup(*self.modules_before)
for modulename in self.modules_to_cleanup:
if modulename in sys.modules:
del sys.modules[modulename]
if self.root: # Only clean if the test was actually run
cleanout(self.root)

Expand All @@ -75,17 +76,17 @@ def mkhier(self, descr):
os.mkdir(root)
for name, contents in descr:
comps = name.split()
self.modules_to_cleanup.add('.'.join(comps))
fullname = root
for c in comps:
fullname = os.path.join(fullname, c)
if contents is None:
os.mkdir(fullname)
else:
f = open(fullname, "w")
f.write(contents)
if contents and contents[-1] != '\n':
f.write('\n')
f.close()
with open(fullname, "w") as f:
f.write(contents)
if not contents.endswith('\n'):
f.write('\n')
self.root = root
# package name is the name of the first item
self.pkgname = descr[0][0]
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Tests/2018-09-12-17-00-34.bpo-34200.dfxYQK.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fixed non-deterministic flakiness of test_pkg by not using the scary
test.support.module_cleanup() logic to save and restore sys.modules contents
between test cases.