From 9a4fa9567cef9c40f589d2bc3ac4b0ec9aceb079 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sun, 4 Feb 2007 11:40:09 +0000 Subject: [PATCH] testsuite/common.py: A private variable of unittest.TestCase changed name in python 2.5. Original commit message from CVS: * testsuite/common.py: A private variable of unittest.TestCase changed name in python 2.5. This fixes make check with python2.5 --- ChangeLog | 6 ++++++ testsuite/common.py | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a86c772bbe..3dbc0366b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-02-04 Edward Hervey + + * testsuite/common.py: + A private variable of unittest.TestCase changed name in python 2.5. + This fixes make check with python2.5 + 2007-02-04 Rene Stadler reviewed by: Edward Hervey diff --git a/testsuite/common.py b/testsuite/common.py index 159b664b38..10f83cc395 100644 --- a/testsuite/common.py +++ b/testsuite/common.py @@ -149,15 +149,25 @@ class TestCase(unittest.TestCase): """ Override me by chaining up to me at the start of your setUp. """ - gst.debug('%s.%s' % (self.__class__.__name__, - self.__testMethodName)) + # Using private variables is BAD ! this variable changed name in + # python 2.5 + try: + methodName = self.__testMethodName + except: + methodName = self._testMethodName + gst.debug('%s.%s' % (self.__class__.__name__, methodName)) self.gctrack() def tearDown(self): """ Override me by chaining up to me at the end of your tearDown. """ - gst.debug('%s.%s' % (self.__class__.__name__, - self.__testMethodName)) + # Using private variables is BAD ! this variable changed name in + # python 2.5 + try: + methodName = self.__testMethodName + except: + methodName = self._testMethodName + gst.debug('%s.%s' % (self.__class__.__name__, methodName)) self.gccollect() self.gcverify()