Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r54119:7acf5b725d8f
Date: 2012-04-01 16:33 +0200
http://bitbucket.org/pypy/pypy/changeset/7acf5b725d8f/
Log: Cannot do this testing when running with "py.test -A".
diff --git a/pypy/module/sys/test/test_sysmodule.py
b/pypy/module/sys/test/test_sysmodule.py
--- a/pypy/module/sys/test/test_sysmodule.py
+++ b/pypy/module/sys/test/test_sysmodule.py
@@ -600,30 +600,33 @@
class AppTestSysExcInfoDirect:
def setup_method(self, meth):
- self.seen = []
- from pypy.module.sys import vm
- def exc_info_with_tb(*args):
- self.seen.append("n") # not optimized
- return self.old[0](*args)
- def exc_info_without_tb(*args):
- self.seen.append("y") # optimized
- return self.old[1](*args)
- self.old = [vm.exc_info_with_tb, vm.exc_info_without_tb]
- vm.exc_info_with_tb = exc_info_with_tb
- vm.exc_info_without_tb = exc_info_without_tb
- #
- from pypy.rlib import jit
- self.old2 = [jit.we_are_jitted]
- jit.we_are_jitted = lambda: True
+ self.checking = not option.runappdirect
+ if self.checking:
+ self.seen = []
+ from pypy.module.sys import vm
+ def exc_info_with_tb(*args):
+ self.seen.append("n") # not optimized
+ return self.old[0](*args)
+ def exc_info_without_tb(*args):
+ self.seen.append("y") # optimized
+ return self.old[1](*args)
+ self.old = [vm.exc_info_with_tb, vm.exc_info_without_tb]
+ vm.exc_info_with_tb = exc_info_with_tb
+ vm.exc_info_without_tb = exc_info_without_tb
+ #
+ from pypy.rlib import jit
+ self.old2 = [jit.we_are_jitted]
+ jit.we_are_jitted = lambda: True
def teardown_method(self, meth):
- from pypy.module.sys import vm
- from pypy.rlib import jit
- vm.exc_info_with_tb = self.old[0]
- vm.exc_info_without_tb = self.old[1]
- jit.we_are_jitted = self.old2[0]
- #
- assert ''.join(self.seen) == meth.expected
+ if self.checking:
+ from pypy.module.sys import vm
+ from pypy.rlib import jit
+ vm.exc_info_with_tb = self.old[0]
+ vm.exc_info_without_tb = self.old[1]
+ jit.we_are_jitted = self.old2[0]
+ #
+ assert ''.join(self.seen) == meth.expected
def test_returns_none(self):
import sys
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
