aboutsummaryrefslogtreecommitdiffstats
path: root/tests/samplebinding/virtualmethods_test.py
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-09-28 17:55:54 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:18:18 -0300
commitb9ab302dd7aff3ecbbbc7ffe1ef2ef0bf4956a5a (patch)
treeb2c62e3ae790b7c5a70f7308282ec2975aa168a2 /tests/samplebinding/virtualmethods_test.py
parent6b21c2fa5eeb6a7c7b6533f1c966a47d8ef07e69 (diff)
Fixed tests to work with python3.x and python2.x
Diffstat (limited to 'tests/samplebinding/virtualmethods_test.py')
-rw-r--r--tests/samplebinding/virtualmethods_test.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/samplebinding/virtualmethods_test.py b/tests/samplebinding/virtualmethods_test.py
index f2895af64..376ab8495 100644
--- a/tests/samplebinding/virtualmethods_test.py
+++ b/tests/samplebinding/virtualmethods_test.py
@@ -32,7 +32,6 @@ import unittest
from sample import *
import warnings
-warnings.simplefilter('error')
class ExtendedVirtualMethods(VirtualMethods):
def __init__(self):
@@ -44,6 +43,7 @@ class ExtendedVirtualMethods(VirtualMethods):
return VirtualMethods.virtualMethod0(self, pt, val, cpx, b) * -1.0
def strListToStdList(self, arg):
+ warnings.simplefilter('error')
# returning wrong type for test purposes.
return True
@@ -105,7 +105,7 @@ class VirtualMethodsTest(unittest.TestCase):
self.assertFalse(evd.grand_daughter_name_called)
name = evd.callName()
- self.assert_(evd.grand_daughter_name_called)
+ self.assertTrue(evd.grand_daughter_name_called)
self.assertEqual(evd.name().prepend(self.prefix_from_codeinjection), name)
def testReimplementedVirtualMethodInheritedFromGrandGrandParent(self):
@@ -119,8 +119,8 @@ class VirtualMethodsTest(unittest.TestCase):
self.assertFalse(eevd.grand_grand_daughter_name_called)
name = eevd.callName()
- self.assert_(eevd.grand_daughter_name_called)
- self.assert_(eevd.grand_grand_daughter_name_called)
+ self.assertTrue(eevd.grand_daughter_name_called)
+ self.assertTrue(eevd.grand_grand_daughter_name_called)
self.assertEqual(eevd.name().prepend(self.prefix_from_codeinjection), name)
class PrettyErrorMessageTest(unittest.TestCase):