[pypy-svn] r77602 - in pypy/branch/minor-cleanup/pypy/translator: jvm/test oosupport/test_template

[arigo at codespeak.net]

Author: arigo
Date: Tue Oct  5 14:36:55 2010
New Revision: 77602

Modified:
   pypy/branch/minor-cleanup/pypy/translator/jvm/test/test_class.py
   pypy/branch/minor-cleanup/pypy/translator/oosupport/test_template/class_.py
Log:
Kill stuff here.


Modified: pypy/branch/minor-cleanup/pypy/translator/jvm/test/test_class.py
==============================================================================
--- pypy/branch/minor-cleanup/pypy/translator/jvm/test/test_class.py	(original)
+++ pypy/branch/minor-cleanup/pypy/translator/jvm/test/test_class.py	Tue Oct  5 14:36:55 2010
@@ -1,6 +1,6 @@
 import py
 from pypy.translator.jvm.test.runtest import JvmTest
-from pypy.translator.oosupport.test_template.class_ import BaseTestClass, BaseTestSpecialcase
+from pypy.translator.oosupport.test_template.class_ import BaseTestClass
 
 class TestJvmClass(JvmTest, BaseTestClass):    
     def test_overridden_classattr_as_defaults(self):
@@ -26,6 +26,3 @@
             
     def test_specialize_methods(self):
         py.test.skip('ABSTRACT METHOD FIX: RE-TEST AFTER MERGE')
-
-class TestJvmSpecialCase(JvmTest, BaseTestSpecialcase):
-    pass

Modified: pypy/branch/minor-cleanup/pypy/translator/oosupport/test_template/class_.py
==============================================================================
--- pypy/branch/minor-cleanup/pypy/translator/oosupport/test_template/class_.py	(original)
+++ pypy/branch/minor-cleanup/pypy/translator/oosupport/test_template/class_.py	Tue Oct  5 14:36:55 2010
@@ -1,6 +1,5 @@
 import py
 from pypy.rpython.test import test_rclass
-from pypy.rpython.test.test_rspecialcase import BaseTestRspecialcase
 
 class BaseTestClass(test_rclass.TestOOtype):
     def test_abstract_method(self):
@@ -66,6 +65,3 @@
 
     def test_cast_object_mix_null(self):
         py.test.skip('cannot return ootype.NULL from translated functions')
-
-class BaseTestSpecialcase(BaseTestRspecialcase):
-    pass