diff options
| author | Jason Pellerin <jpellerin@gmail.com> | 2007-08-12 01:11:24 +0000 |
|---|---|---|
| committer | Jason Pellerin <jpellerin@gmail.com> | 2007-08-12 01:11:24 +0000 |
| commit | 65b2975d6c4e6af7a64725987a5838d3e71245e5 (patch) | |
| tree | 17743fcce585c609e25aa0531c283717b7adfc6b /nose/proxy.py | |
| parent | 975d3d0889a9414fdc615de410bd9900ff5bb386 (diff) | |
| download | nose-65b2975d6c4e6af7a64725987a5838d3e71245e5.tar.gz | |
Merged 0.10.0-stable [282]:[308] into trunk
Diffstat (limited to 'nose/proxy.py')
| -rw-r--r-- | nose/proxy.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nose/proxy.py b/nose/proxy.py index 777b7ef..3387bb8 100644 --- a/nose/proxy.py +++ b/nose/proxy.py @@ -84,7 +84,7 @@ class ResultProxy(object): self.assertMyTest(test) self.plugins.afterTest(self.test) try: - self.result.afterTest(test) + self.result.afterTest(self.test) except AttributeError: pass @@ -92,54 +92,54 @@ class ResultProxy(object): self.assertMyTest(test) self.plugins.beforeTest(self.test) try: - self.result.beforeTest(test) + self.result.beforeTest(self.test) except AttributeError: pass def addError(self, test, err): self.assertMyTest(test) plugins = self.plugins - plugin_handled = plugins.handleError(test, err) + plugin_handled = plugins.handleError(self.test, err) if plugin_handled: return formatted = plugins.formatError(self.test, err) if formatted is not None: err = formatted plugins.addError(self.test, err) - self.result.addError(test, err) + self.result.addError(self.test, err) if self.config.stopOnError: self.shouldStop = True def addFailure(self, test, err): self.assertMyTest(test) plugins = self.plugins - plugin_handled = plugins.handleFailure(test, err) + plugin_handled = plugins.handleFailure(self.test, err) if plugin_handled: return formatted = plugins.formatFailure(self.test, err) if formatted is not None: err = formatted plugins.addFailure(self.test, err) - self.result.addFailure(test, err) + self.result.addFailure(self.test, err) if self.config.stopOnError: self.shouldStop = True def addSuccess(self, test): self.assertMyTest(test) self.plugins.addSuccess(self.test) - self.result.addSuccess(test) + self.result.addSuccess(self.test) def startTest(self, test): self.assertMyTest(test) self.plugins.startTest(self.test) - self.result.startTest(test) + self.result.startTest(self.test) def stop(self): self.result.stop() def stopTest(self, test): self.plugins.stopTest(self.test) - self.result.stopTest(test) + self.result.stopTest(self.test) def get_shouldStop(self): return self.result.shouldStop |