Author: Armin Rigo <[email protected]>
Branch:
Changeset: r63644:b781ef8b70af
Date: 2013-04-26 15:15 +0200
http://bitbucket.org/pypy/pypy/changeset/b781ef8b70af/
Log: Waah. Don't do "import TestXxx" classes in other tests: these
imported test classes will be run again.
diff --git a/rpython/memory/test/test_generational_gc.py
b/rpython/memory/test/test_generational_gc.py
--- a/rpython/memory/test/test_generational_gc.py
+++ b/rpython/memory/test/test_generational_gc.py
@@ -1,4 +1,4 @@
-from rpython.memory.test.test_semispace_gc import TestSemiSpaceGC
+from rpython.memory.test import test_semispace_gc
-class TestGenerationalGC(TestSemiSpaceGC):
+class TestGenerationalGC(test_semispace_gc.TestSemiSpaceGC):
from rpython.memory.gc.generation import GenerationGC as GCClass
diff --git a/rpython/memory/test/test_growingsemispace_gc.py
b/rpython/memory/test/test_growingsemispace_gc.py
--- a/rpython/memory/test/test_growingsemispace_gc.py
+++ b/rpython/memory/test/test_growingsemispace_gc.py
@@ -1,8 +1,8 @@
from rpython.rlib.rarithmetic import LONG_BIT
-from rpython.memory.test.test_semispace_gc import TestSemiSpaceGC
+from rpython.memory.test import test_semispace_gc
WORD = LONG_BIT // 8
-class TestGrowingSemiSpaceGC(TestSemiSpaceGC):
+class TestGrowingSemiSpaceGC(test_semispace_gc.TestSemiSpaceGC):
GC_PARAMS = {'space_size': 16*WORD}
diff --git a/rpython/memory/test/test_hybrid_gc.py
b/rpython/memory/test/test_hybrid_gc.py
--- a/rpython/memory/test/test_hybrid_gc.py
+++ b/rpython/memory/test/test_hybrid_gc.py
@@ -3,10 +3,10 @@
from rpython.rtyper.lltypesystem import lltype
from rpython.rtyper.lltypesystem.lloperation import llop
-from rpython.memory.test.test_generational_gc import TestGenerationalGC
+from rpython.memory.test import test_generational_gc
-class TestHybridGC(TestGenerationalGC):
+class TestHybridGC(test_generational_gc.TestGenerationalGC):
from rpython.memory.gc.hybrid import HybridGC as GCClass
GC_CAN_MALLOC_NONMOVABLE = True
GC_CAN_SHRINK_BIG_ARRAY = False
diff --git a/rpython/memory/test/test_minimark_gc.py
b/rpython/memory/test/test_minimark_gc.py
--- a/rpython/memory/test/test_minimark_gc.py
+++ b/rpython/memory/test/test_minimark_gc.py
@@ -1,10 +1,10 @@
from rpython.rlib.rarithmetic import LONG_BIT
-from rpython.memory.test.test_semispace_gc import TestSemiSpaceGC
+from rpython.memory.test import test_semispace_gc
WORD = LONG_BIT // 8
-class TestMiniMarkGC(TestSemiSpaceGC):
+class TestMiniMarkGC(test_semispace_gc.TestSemiSpaceGC):
from rpython.memory.gc.minimark import MiniMarkGC as GCClass
GC_CAN_SHRINK_BIG_ARRAY = False
GC_CAN_MALLOC_NONMOVABLE = True
diff --git a/rpython/memory/test/test_minimark_gc_cardmarking.py
b/rpython/memory/test/test_minimark_gc_cardmarking.py
--- a/rpython/memory/test/test_minimark_gc_cardmarking.py
+++ b/rpython/memory/test/test_minimark_gc_cardmarking.py
@@ -1,4 +1,4 @@
-from rpython.memory.test.test_minimark_gc import TestMiniMarkGC
+from rpython.memory.test import test_minimark_gc
-class TestMiniMarkGCCardMarking(TestMiniMarkGC):
+class TestMiniMarkGCCardMarking(test_minimark_gc.TestMiniMarkGC):
GC_PARAMS = {'card_page_indices': 4}
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
