Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r93258:7f17056199b6
Date: 2017-12-03 18:44 +0000
http://bitbucket.org/pypy/pypy/changeset/7f17056199b6/
Log: fix bad merge
diff --git a/pypy/module/thread/test/test_import_lock.py
b/pypy/module/thread/test/test_import_lock.py
--- a/pypy/module/thread/test/test_import_lock.py
+++ b/pypy/module/thread/test/test_import_lock.py
@@ -101,8 +101,8 @@
importhook(space, 'sys')
assert importlock.count == 0
# A new module
- importhook(space, 're')
- assert importlock.count >= 9
+ importhook(space, 'time')
+ assert importlock.count >= 1
# Import it again
previous_count = importlock.count
importhook(space, "time")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
