[pypy-commit] lang-smalltalk default: moved image loading to setup method

[lwassermann]

Author: Lars Wassermann <lars.wassermann at gmail.com>
Branch: 
Changeset: r385:b720ba90f384
Date: 2013-05-15 10:29 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/b720ba90f384/

Log:	moved image loading to setup method

diff --git a/spyvm/test/test_bootstrappedimage.py b/spyvm/test/test_bootstrappedimage.py
--- a/spyvm/test/test_bootstrappedimage.py
+++ b/spyvm/test/test_bootstrappedimage.py
@@ -2,9 +2,9 @@
 from spyvm import squeakimage, model, constants
 from spyvm import interpreter, shadow, objspace
 from spyvm.test import test_miniimage as tools
-from spyvm.test.test_miniimage import perform, w
 
-tools.setup_module(tools, filename='bootstrapped.image')
+def setup():
+    tools.setup_module(tools, filename='bootstrapped.image')
 
 def find_symbol_in_methoddict_of(string, s_class):
     s_methoddict = s_class.s_methoddict()
@@ -17,19 +17,19 @@
 def initialize_class(w_class):
     initialize_symbol = find_symbol_in_methoddict_of("initialize",
                         w_class.shadow_of_my_class(tools.space))
-    perform(w_class, initialize_symbol)
+    tools.perform(w_class, initialize_symbol)
 
 def test_initialize_string_class():
     #initialize String class, because equality testing requires a class var set.
-    initialize_class(w("string").getclass(tools.space))
+    initialize_class(tools.w("string").getclass(tools.space))
 
 def test_symbol_asSymbol():
-    w_result = perform(tools.image.w_asSymbol, "asSymbol")
+    w_result = tools.perform(tools.image.w_asSymbol, "asSymbol")
     assert w_result is tools.image.w_asSymbol
 
 def test_create_new_symbol():
     py.test.skip("This test takes quite long and is actually included in test_retrieve_symbol.")
-    w_result = perform(w("someString"), "asSymbol")
+    w_result = tools.perform(tools.w("someString"), "asSymbol")
     assert w_result is not None
     assert w_result.as_string() == "someString"
 
@@ -42,11 +42,10 @@
             self = sym
                 ifTrue: [ ^ sym ] ].
     ^ (Symbol basicNew: self size) initFrom: self"""
-    w_result = perform(w("someString"), "asSymbol")
+    w_result = tools.perform(tools.w("someString"), "asSymbol")
     assert w_result.as_string() == "someString"
-    w_anotherSymbol = perform(w("someString"), "asSymbol")
+    w_anotherSymbol = tools.perform(tools.w("someString"), "asSymbol")
     assert w_result is w_anotherSymbol
 
-def test_all_pointers_are_valid():
-    tools.test_all_pointers_are_valid()
-    tools.test_lookup_abs_in_integer()
+test_all_pointers_are_valid = tools.test_all_pointers_are_valid
+test_lookup_abs_in_integer = tools.test_lookup_abs_in_integer
diff --git a/spyvm/test/test_in_squeak_4_5_image.py b/spyvm/test/test_in_squeak_4_5_image.py
--- a/spyvm/test/test_in_squeak_4_5_image.py
+++ b/spyvm/test/test_in_squeak_4_5_image.py
@@ -2,11 +2,12 @@
 from spyvm import squeakimage, model, constants
 from spyvm import interpreter, shadow, objspace
 from spyvm.test import test_miniimage as tools
-from spyvm.test.test_miniimage import perform, w
+from spyvm.test.test_miniimage import w
 
-tools.setup_module(tools, filename='Squeak4.5-12568.image')
-space = tools.space
-interp = tools.interp
+def setup():
+    tools.setup_module(tools, filename='Squeak4.5-12568.image')
+    global space = tools.space
+    global interp = tools.interp
 
 def find_symbol_in_methoddict_of(string, s_class):
     s_methoddict = s_class.s_methoddict()