jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3562 from nicoddemus/revert-callinfo-result 

Revert change of Callinfo.result default value
This commit is contained in:
Ronny Pfannschmidt 2018-06-11 19:03:01 +02:00 committed by GitHub
parent efc9a0ecb5 10b0b81346
commit 61471df8da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/_pytest/runner.py
View File

@ -194,7 +194,6 @@ class CallInfo(object):
#: "teardown", "memocollect" #: "teardown", "memocollect"
self.when = when self.when = when
self.start = time() self.start = time()
self.result = None
try: try:
self.result = func() self.result = func()
except KeyboardInterrupt: except KeyboardInterrupt:

2
testing/test_runner.py
View File

@ -473,7 +473,7 @@ def test_callinfo():
assert "result" in repr(ci) assert "result" in repr(ci)
ci = runner.CallInfo(lambda: 0 / 0, "123") ci = runner.CallInfo(lambda: 0 / 0, "123")
assert ci.when == "123" assert ci.when == "123"
assert ci.result is None assert not hasattr(ci, "result")
assert ci.excinfo assert ci.excinfo
assert "exc" in repr(ci) assert "exc" in repr(ci)