Author: Amaury Forgeot d'Arc <[email protected]>
Branch: less-gettestobjspace
Changeset: r58614:c48f4c221e50
Date: 2012-10-29 00:17 +0100
http://bitbucket.org/pypy/pypy/changeset/c48f4c221e50/
Log: progress
diff --git a/pypy/module/_multibytecodec/test/test_app_codecs.py
b/pypy/module/_multibytecodec/test/test_app_codecs.py
--- a/pypy/module/_multibytecodec/test/test_app_codecs.py
+++ b/pypy/module/_multibytecodec/test/test_app_codecs.py
@@ -1,9 +1,5 @@
-from pypy.conftest import gettestobjspace
-
-
class AppTestCodecs:
- def setup_class(cls):
- cls.space = gettestobjspace(usemodules=['_multibytecodec'])
+ spaceconfig = dict(usemodules=['_multibytecodec'])
def test_missing_codec(self):
import _codecs_cn
diff --git a/pypy/module/_multibytecodec/test/test_app_incremental.py
b/pypy/module/_multibytecodec/test/test_app_incremental.py
--- a/pypy/module/_multibytecodec/test/test_app_incremental.py
+++ b/pypy/module/_multibytecodec/test/test_app_incremental.py
@@ -1,9 +1,7 @@
-from pypy.conftest import gettestobjspace
+class AppTestClasses:
+ spaceconfig = dict(usemodules=['_multibytecodec'])
-
-class AppTestClasses:
def setup_class(cls):
- cls.space = gettestobjspace(usemodules=['_multibytecodec'])
cls.w_IncrementalHzDecoder = cls.space.appexec([], """():
import _codecs_cn
from _multibytecodec import MultibyteIncrementalDecoder
diff --git a/pypy/module/_multibytecodec/test/test_app_stream.py
b/pypy/module/_multibytecodec/test/test_app_stream.py
--- a/pypy/module/_multibytecodec/test/test_app_stream.py
+++ b/pypy/module/_multibytecodec/test/test_app_stream.py
@@ -1,9 +1,7 @@
-from pypy.conftest import gettestobjspace
+class AppTestStreams:
+ spaceconfig = dict(usemodules=['_multibytecodec'])
-
-class AppTestStreams:
def setup_class(cls):
- cls.space = gettestobjspace(usemodules=['_multibytecodec'])
cls.w_HzStreamReader = cls.space.appexec([], """():
import _codecs_cn
from _multibytecodec import MultibyteStreamReader
diff --git a/pypy/module/_multiprocessing/test/test_connection.py
b/pypy/module/_multiprocessing/test/test_connection.py
--- a/pypy/module/_multiprocessing/test/test_connection.py
+++ b/pypy/module/_multiprocessing/test/test_connection.py
@@ -1,6 +1,5 @@
import py
import sys
-from pypy.conftest import gettestobjspace, option
from pypy.interpreter.gateway import interp2app, W_Root
class TestImport:
@@ -9,11 +8,10 @@
from pypy.module._multiprocessing import interp_semaphore
class AppTestBufferTooShort:
+ spaceconfig = dict(usemodules=['_multiprocessing', 'thread', 'signal'])
+
def setup_class(cls):
- space = gettestobjspace(usemodules=('_multiprocessing', 'thread',
'signal'))
- cls.space = space
-
- if option.runappdirect:
+ if cls.option.runappdirect:
def raiseBufferTooShort(self, data):
import multiprocessing
raise multiprocessing.BufferTooShort(data)
@@ -22,7 +20,7 @@
from pypy.module._multiprocessing import interp_connection
def raiseBufferTooShort(space, w_data):
raise interp_connection.BufferTooShort(space, w_data)
- cls.w_raiseBufferTooShort = space.wrap(
+ cls.w_raiseBufferTooShort = cls.space.wrap(
interp2app(raiseBufferTooShort))
def test_exception(self):
@@ -69,14 +67,14 @@
assert rhandle.readable
class AppTestWinpipeConnection(BaseConnectionTest):
+ spaceconfig = dict(usemodules=('_multiprocessing', 'thread'))
+
def setup_class(cls):
if sys.platform != "win32":
py.test.skip("win32 only")
- if not option.runappdirect:
- space = gettestobjspace(usemodules=('_multiprocessing', 'thread'))
- cls.space = space
-
+ if not cls.option.runappdirect:
+ space = cls.space
# stubs for some modules,
# just for multiprocessing to import correctly on Windows
w_modules = space.sys.get('modules')
@@ -91,11 +89,10 @@
return multiprocessing.Pipe(duplex=False)
class AppTestSocketConnection(BaseConnectionTest):
+ spaceconfig = dict(usemodules=('_multiprocessing', 'thread', 'signal',
+ 'struct', 'array'))
def setup_class(cls):
- space = gettestobjspace(usemodules=('_multiprocessing', 'thread',
'signal',
- 'struct', 'array'))
- cls.space = space
- cls.w_connections = space.newlist([])
+ cls.w_connections = cls.space.newlist([])
def socketpair(space):
"A socket.socketpair() that works on Windows"
@@ -117,10 +114,10 @@
space.call_method(cls.w_connections, "append", space.wrap(client))
return space.wrap((server.fileno(), client.fileno()))
- if option.runappdirect:
- cls.w_socketpair = lambda self: socketpair(space)
+ if cls.option.runappdirect:
+ cls.w_socketpair = lambda self: socketpair(cls.space)
else:
- cls.w_socketpair = space.wrap(interp2app(socketpair))
+ cls.w_socketpair = cls.space.wrap(interp2app(socketpair))
def w_make_pair(self):
import _multiprocessing
diff --git a/pypy/module/_multiprocessing/test/test_memory.py
b/pypy/module/_multiprocessing/test/test_memory.py
--- a/pypy/module/_multiprocessing/test/test_memory.py
+++ b/pypy/module/_multiprocessing/test/test_memory.py
@@ -1,10 +1,6 @@
-from pypy.conftest import gettestobjspace
-
class AppTestMemory:
- def setup_class(cls):
- space = gettestobjspace(
- usemodules=('_multiprocessing', 'mmap', '_rawffi', '_ffi'))
- cls.space = space
+ spaceconfig = dict(usemodules=('_multiprocessing', 'mmap',
+ '_rawffi', '_ffi'))
def test_address_of(self):
import _multiprocessing
diff --git a/pypy/module/_multiprocessing/test/test_semaphore.py
b/pypy/module/_multiprocessing/test/test_semaphore.py
--- a/pypy/module/_multiprocessing/test/test_semaphore.py
+++ b/pypy/module/_multiprocessing/test/test_semaphore.py
@@ -1,14 +1,13 @@
-from pypy.conftest import gettestobjspace
from pypy.module._multiprocessing.interp_semaphore import (
RECURSIVE_MUTEX, SEMAPHORE)
class AppTestSemaphore:
+ spaceconfig = dict(usemodules=('_multiprocessing', 'thread'))
+
def setup_class(cls):
- space = gettestobjspace(usemodules=('_multiprocessing', 'thread'))
- cls.space = space
- cls.w_SEMAPHORE = space.wrap(SEMAPHORE)
- cls.w_RECURSIVE = space.wrap(RECURSIVE_MUTEX)
+ cls.w_SEMAPHORE = cls.space.wrap(SEMAPHORE)
+ cls.w_RECURSIVE = cls.space.wrap(RECURSIVE_MUTEX)
def test_semaphore(self):
from _multiprocessing import SemLock
diff --git a/pypy/module/_multiprocessing/test/test_win32.py
b/pypy/module/_multiprocessing/test/test_win32.py
--- a/pypy/module/_multiprocessing/test/test_win32.py
+++ b/pypy/module/_multiprocessing/test/test_win32.py
@@ -1,12 +1,12 @@
import py
import sys
-from pypy.conftest import gettestobjspace
class AppTestWin32:
+ spaceconfig = dict(usemodules=('_multiprocessing',))
+
def setup_class(cls):
if sys.platform != "win32":
py.test.skip("win32 only")
- cls.space = gettestobjspace(usemodules=('_multiprocessing',))
def test_CloseHandle(self):
from _multiprocessing import win32
diff --git a/pypy/module/oracle/test/test_connect.py
b/pypy/module/oracle/test/test_connect.py
--- a/pypy/module/oracle/test/test_connect.py
+++ b/pypy/module/oracle/test/test_connect.py
@@ -1,14 +1,13 @@
-from pypy.conftest import gettestobjspace
from pypy.conftest import option
from pypy.rpython.tool.rffi_platform import CompilationError
import py
class OracleNotConnectedTestBase(object):
+ spaceconfig = dict(usemodules=('oracle',))
@classmethod
def setup_class(cls):
- space = gettestobjspace(usemodules=('oracle',))
- cls.space = space
+ space = cls.space
space.setitem(space.builtin.w_dict, space.wrap('oracle'),
space.getbuiltinmodule('cx_Oracle'))
oracle_connect = option.oracle_connect
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
