summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2011-10-05 22:37:06 +0200
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2011-10-05 22:37:06 +0200
commit3484c09c97141f497de9f99c5d2135e41fde8a11 (patch)
tree6b0b895d56c44e985dd0d5b74fe8aa0cbe4e3346
parentbbe7b0ad2a4bc34e5f9ef3b26653ed5c2642d319 (diff)
parent3e961a5fd141363cc7dc38d4bc9e9e0ff965cd74 (diff)
downloadcpython-git-3484c09c97141f497de9f99c5d2135e41fde8a11.tar.gz
Merge from 3.2
-rw-r--r--Lib/test/test_sys_settrace.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index acb8e29f19..578e95d627 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -283,11 +283,11 @@ class TraceTestCase(unittest.TestCase):
self.compare_events(func.__code__.co_firstlineno,
tracer.events, func.events)
- def set_and_retrieve_none(self):
+ def test_set_and_retrieve_none(self):
sys.settrace(None)
assert sys.gettrace() is None
- def set_and_retrieve_func(self):
+ def test_set_and_retrieve_func(self):
def fn(*args):
pass