summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--decorators.py2
-rw-r--r--testlib.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/decorators.py b/decorators.py
index 7f1ff29..fa7e187 100644
--- a/decorators.py
+++ b/decorators.py
@@ -94,7 +94,7 @@ class wproperty(object):
self.setfunc(obj, value)
def __get__(self, obj, cls):
- assert obj is not None
+ # assert obj is not None
return getattr(obj, self.attrname)
diff --git a/testlib.py b/testlib.py
index 691c938..76efcc5 100644
--- a/testlib.py
+++ b/testlib.py
@@ -896,7 +896,7 @@ succeeded tests into", osp.join(os.getcwd(),FILE_RESTART)
result = self.testRunner.run(self.test)
if hasattr(self.module, 'teardown_module'):
try:
- self.module.teardown_module(self.options)
+ self.module.teardown_module(self.options, result)
except Exception, exc:
print 'teardown_module error:', exc
sys.exit(1)