jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[svn r63192] rename dsession to dist 

--HG--
branch : trunk
This commit is contained in:
hpk 2009-03-21 20:31:09 +01:00
parent fc14b038af
commit 3902890e1b
15 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
py/test/dsession/__init__.py → py/test/dist/__init__.py vendored
View File

2
py/test/dsession/dsession.py → py/test/dist/dsession.py vendored
View File

@ -9,7 +9,7 @@ from py.__.test import event
from py.__.test.runner import basic_run_report, basic_collect_report from py.__.test.runner import basic_run_report, basic_collect_report
from py.__.test.session import Session from py.__.test.session import Session
from py.__.test import outcome from py.__.test import outcome
from py.__.test.dsession.nodemanage import NodeManager from py.__.test.dist.nodemanage import NodeManager
import Queue import Queue

0
py/test/dsession/mypickle.py → py/test/dist/mypickle.py vendored
View File

2
py/test/dsession/nodemanage.py → py/test/dist/nodemanage.py vendored
View File

@ -1,6 +1,6 @@
import py import py
import sys, os import sys, os
from py.__.test.dsession.txnode import MasterNode from py.__.test.dist.txnode import MasterNode
from py.__.execnet.gwmanage import GatewayManager from py.__.execnet.gwmanage import GatewayManager

0
py/test/dsession/testing/__init__.py → py/test/dist/testing/__init__.py vendored
View File

2
py/test/dsession/testing/test_dsession.py → py/test/dist/testing/test_dsession.py vendored
View File

@ -1,4 +1,4 @@
from py.__.test.dsession.dsession import DSession from py.__.test.dist.dsession import DSession
from py.__.test.runner import basic_collect_report from py.__.test.runner import basic_collect_report
from py.__.test import event from py.__.test import event
from py.__.test import outcome from py.__.test import outcome

2
py/test/dsession/testing/test_functional_dsession.py → py/test/dist/testing/test_functional_dsession.py vendored
View File

@ -1,5 +1,5 @@
import py import py
from py.__.test.dsession.dsession import DSession from py.__.test.dist.dsession import DSession
from test_txnode import EventQueue from test_txnode import EventQueue
class TestAsyncFunctional: class TestAsyncFunctional:

26
py/test/dsession/testing/test_mypickle.py → py/test/dist/testing/test_mypickle.py vendored
View File

@ -1,6 +1,6 @@
import py import py
from py.__.test.dsession.mypickle import ImmutablePickler, PickleChannel, UnpickleError from py.__.test.dist.mypickle import ImmutablePickler, PickleChannel, UnpickleError
class A: class A:
pass pass
@ -75,9 +75,9 @@ class TestPickleChannelFunctional:
def test_popen_send_instance(self): def test_popen_send_instance(self):
channel = self.gw.remote_exec(""" channel = self.gw.remote_exec("""
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
channel = PickleChannel(channel) channel = PickleChannel(channel)
from py.__.test.dsession.testing.test_mypickle import A from py.__.test.dist.testing.test_mypickle import A
a1 = A() a1 = A()
a1.hello = 10 a1.hello = 10
channel.send(a1) channel.send(a1)
@ -94,9 +94,9 @@ class TestPickleChannelFunctional:
def test_send_concurrent(self): def test_send_concurrent(self):
channel = self.gw.remote_exec(""" channel = self.gw.remote_exec("""
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
channel = PickleChannel(channel) channel = PickleChannel(channel)
from py.__.test.dsession.testing.test_mypickle import A from py.__.test.dist.testing.test_mypickle import A
l = [A() for i in range(10)] l = [A() for i in range(10)]
channel.send(l) channel.send(l)
other_l = channel.receive() other_l = channel.receive()
@ -124,9 +124,9 @@ class TestPickleChannelFunctional:
def test_popen_with_callback(self): def test_popen_with_callback(self):
channel = self.gw.remote_exec(""" channel = self.gw.remote_exec("""
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
channel = PickleChannel(channel) channel = PickleChannel(channel)
from py.__.test.dsession.testing.test_mypickle import A from py.__.test.dist.testing.test_mypickle import A
a1 = A() a1 = A()
a1.hello = 10 a1.hello = 10
channel.send(a1) channel.send(a1)
@ -145,9 +145,9 @@ class TestPickleChannelFunctional:
def test_popen_with_callback_with_endmarker(self): def test_popen_with_callback_with_endmarker(self):
channel = self.gw.remote_exec(""" channel = self.gw.remote_exec("""
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
channel = PickleChannel(channel) channel = PickleChannel(channel)
from py.__.test.dsession.testing.test_mypickle import A from py.__.test.dist.testing.test_mypickle import A
a1 = A() a1 = A()
a1.hello = 10 a1.hello = 10
channel.send(a1) channel.send(a1)
@ -169,9 +169,9 @@ class TestPickleChannelFunctional:
def test_popen_with_callback_with_endmarker_and_unpickling_error(self): def test_popen_with_callback_with_endmarker_and_unpickling_error(self):
channel = self.gw.remote_exec(""" channel = self.gw.remote_exec("""
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
channel = PickleChannel(channel) channel = PickleChannel(channel)
from py.__.test.dsession.testing.test_mypickle import A from py.__.test.dist.testing.test_mypickle import A
a1 = A() a1 = A()
channel.send(a1) channel.send(a1)
channel.send(a1) channel.send(a1)
@ -188,7 +188,7 @@ class TestPickleChannelFunctional:
def test_popen_with_newchannel(self): def test_popen_with_newchannel(self):
channel = self.gw.remote_exec(""" channel = self.gw.remote_exec("""
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
channel = PickleChannel(channel) channel = PickleChannel(channel)
newchannel = channel.receive() newchannel = channel.receive()
newchannel.send(42) newchannel.send(42)
@ -202,7 +202,7 @@ class TestPickleChannelFunctional:
def test_popen_with_various_methods(self): def test_popen_with_various_methods(self):
channel = self.gw.remote_exec(""" channel = self.gw.remote_exec("""
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
channel = PickleChannel(channel) channel = PickleChannel(channel)
channel.receive() channel.receive()
""") """)

2
py/test/dsession/testing/test_nodemanage.py → py/test/dist/testing/test_nodemanage.py vendored
View File

@ -3,7 +3,7 @@
""" """
import py import py
from py.__.test.dsession.nodemanage import NodeManager from py.__.test.dist.nodemanage import NodeManager
from py.__.test import event from py.__.test import event

2
py/test/dsession/testing/test_txnode.py → py/test/dist/testing/test_txnode.py vendored
View File

@ -1,6 +1,6 @@
import py import py
from py.__.test.dsession.txnode import MasterNode from py.__.test.dist.txnode import MasterNode
class EventQueue: class EventQueue:
def __init__(self, bus, queue=None): def __init__(self, bus, queue=None):

6
py/test/dsession/txnode.py → py/test/dist/txnode.py vendored
View File

@ -3,7 +3,7 @@
""" """
import py import py
from py.__.test import event from py.__.test import event
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
class MasterNode(object): class MasterNode(object):
""" Install slave code, manage sending test tasks & receiving results """ """ Install slave code, manage sending test tasks & receiving results """
@ -70,8 +70,8 @@ class MasterNode(object):
# setting up slave code # setting up slave code
def install_slave(gateway, config): def install_slave(gateway, config):
channel = gateway.remote_exec(source=""" channel = gateway.remote_exec(source="""
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
from py.__.test.dsession.txnode import SlaveNode from py.__.test.dist.txnode import SlaveNode
channel = PickleChannel(channel) channel = PickleChannel(channel)
slavenode = SlaveNode(channel) slavenode = SlaveNode(channel)
slavenode.run() slavenode.run()

4
py/test/looponfail/remote.py
View File

@ -11,7 +11,7 @@
from __future__ import generators from __future__ import generators
import py import py
from py.__.test.session import Session from py.__.test.session import Session
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
from py.__.test import event from py.__.test import event
from py.__.test.looponfail import util from py.__.test.looponfail import util
@ -70,7 +70,7 @@ class RemoteControl(object):
finally: finally:
old.chdir() old.chdir()
channel = self.gateway.remote_exec(source=""" channel = self.gateway.remote_exec(source="""
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
from py.__.test.looponfail.remote import slave_runsession from py.__.test.looponfail.remote import slave_runsession
channel = PickleChannel(channel) channel = PickleChannel(channel)
config, fullwidth, hasmarkup = channel.receive() config, fullwidth, hasmarkup = channel.receive()

2
py/test/plugin/pytest_default.py
View File

@ -135,7 +135,7 @@ class DefaultPlugin:
from py.__.test.looponfail.remote import LooponfailingSession from py.__.test.looponfail.remote import LooponfailingSession
config.setsessionclass(LooponfailingSession) config.setsessionclass(LooponfailingSession)
elif val("numprocesses") or val("dist"): elif val("numprocesses") or val("dist"):
from py.__.test.dsession.dsession import DSession from py.__.test.dist.dsession import DSession
config.setsessionclass(DSession) config.setsessionclass(DSession)
def pytest_item_makereport(self, item, excinfo, when, outerr): def pytest_item_makereport(self, item, excinfo, when, outerr):

2
py/test/runner.py
View File

@ -10,7 +10,7 @@ import py, os, sys
from py.__.test import event from py.__.test import event
from py.__.test.outcome import Exit from py.__.test.outcome import Exit
from py.__.test.dsession.mypickle import ImmutablePickler from py.__.test.dist.mypickle import ImmutablePickler
import py.__.test.custompdb import py.__.test.custompdb
class RobustRun(object): class RobustRun(object):

6
py/test/testing/test_pickling.py
View File

@ -23,7 +23,7 @@ def pytest_pyfunc_call(__call__, pyfuncitem, args, kwargs):
class ImmutablePickleTransport: class ImmutablePickleTransport:
def __init__(self): def __init__(self):
from py.__.test.dsession.mypickle import ImmutablePickler from py.__.test.dist.mypickle import ImmutablePickler
self.p1 = ImmutablePickler(uneven=0) self.p1 = ImmutablePickler(uneven=0)
self.p2 = ImmutablePickler(uneven=1) self.p2 = ImmutablePickler(uneven=1)
@ -168,11 +168,11 @@ class TestConfigPickling:
old.chdir() old.chdir()
def test_config__setstate__wired_correctly_in_childprocess(testdir): def test_config__setstate__wired_correctly_in_childprocess(testdir):
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
gw = py.execnet.PopenGateway() gw = py.execnet.PopenGateway()
channel = gw.remote_exec(""" channel = gw.remote_exec("""
import py import py
from py.__.test.dsession.mypickle import PickleChannel from py.__.test.dist.mypickle import PickleChannel
channel = PickleChannel(channel) channel = PickleChannel(channel)
config = channel.receive() config = channel.receive()
assert py.test.config.pytestplugins.pyplugins == py._com.pyplugins, "pyplugins wrong" assert py.test.config.pytestplugins.pyplugins == py._com.pyplugins, "pyplugins wrong"