From 3902890e1b8d26f58517f8dc5885903f1011dffa Mon Sep 17 00:00:00 2001 From: hpk Date: Sat, 21 Mar 2009 20:31:09 +0100 Subject: [PATCH] [svn r63192] rename dsession to dist --HG-- branch : trunk --- py/test/{dsession => dist}/__init__.py | 0 py/test/{dsession => dist}/dsession.py | 2 +- py/test/{dsession => dist}/mypickle.py | 0 py/test/{dsession => dist}/nodemanage.py | 2 +- .../{dsession => dist}/testing/__init__.py | 0 .../testing/test_dsession.py | 2 +- .../testing/test_functional_dsession.py | 2 +- .../testing/test_mypickle.py | 26 +++++++++---------- .../testing/test_nodemanage.py | 2 +- .../{dsession => dist}/testing/test_txnode.py | 2 +- py/test/{dsession => dist}/txnode.py | 6 ++--- py/test/looponfail/remote.py | 4 +-- py/test/plugin/pytest_default.py | 2 +- py/test/runner.py | 2 +- py/test/testing/test_pickling.py | 6 ++--- 15 files changed, 29 insertions(+), 29 deletions(-) rename py/test/{dsession => dist}/__init__.py (100%) rename py/test/{dsession => dist}/dsession.py (99%) rename py/test/{dsession => dist}/mypickle.py (100%) rename py/test/{dsession => dist}/nodemanage.py (98%) rename py/test/{dsession => dist}/testing/__init__.py (100%) rename py/test/{dsession => dist}/testing/test_dsession.py (99%) rename py/test/{dsession => dist}/testing/test_functional_dsession.py (98%) rename py/test/{dsession => dist}/testing/test_mypickle.py (87%) rename py/test/{dsession => dist}/testing/test_nodemanage.py (99%) rename py/test/{dsession => dist}/testing/test_txnode.py (98%) rename py/test/{dsession => dist}/txnode.py (95%) diff --git a/py/test/dsession/__init__.py b/py/test/dist/__init__.py similarity index 100% rename from py/test/dsession/__init__.py rename to py/test/dist/__init__.py diff --git a/py/test/dsession/dsession.py b/py/test/dist/dsession.py similarity index 99% rename from py/test/dsession/dsession.py rename to py/test/dist/dsession.py index 970e598ad..dece609a3 100644 --- a/py/test/dsession/dsession.py +++ b/py/test/dist/dsession.py @@ -9,7 +9,7 @@ from py.__.test import event from py.__.test.runner import basic_run_report, basic_collect_report from py.__.test.session import Session from py.__.test import outcome -from py.__.test.dsession.nodemanage import NodeManager +from py.__.test.dist.nodemanage import NodeManager import Queue diff --git a/py/test/dsession/mypickle.py b/py/test/dist/mypickle.py similarity index 100% rename from py/test/dsession/mypickle.py rename to py/test/dist/mypickle.py diff --git a/py/test/dsession/nodemanage.py b/py/test/dist/nodemanage.py similarity index 98% rename from py/test/dsession/nodemanage.py rename to py/test/dist/nodemanage.py index 06ebeb1cd..0796523d9 100644 --- a/py/test/dsession/nodemanage.py +++ b/py/test/dist/nodemanage.py @@ -1,6 +1,6 @@ import py import sys, os -from py.__.test.dsession.txnode import MasterNode +from py.__.test.dist.txnode import MasterNode from py.__.execnet.gwmanage import GatewayManager diff --git a/py/test/dsession/testing/__init__.py b/py/test/dist/testing/__init__.py similarity index 100% rename from py/test/dsession/testing/__init__.py rename to py/test/dist/testing/__init__.py diff --git a/py/test/dsession/testing/test_dsession.py b/py/test/dist/testing/test_dsession.py similarity index 99% rename from py/test/dsession/testing/test_dsession.py rename to py/test/dist/testing/test_dsession.py index 624e7ca01..1c2513ca0 100644 --- a/py/test/dsession/testing/test_dsession.py +++ b/py/test/dist/testing/test_dsession.py @@ -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 import event from py.__.test import outcome diff --git a/py/test/dsession/testing/test_functional_dsession.py b/py/test/dist/testing/test_functional_dsession.py similarity index 98% rename from py/test/dsession/testing/test_functional_dsession.py rename to py/test/dist/testing/test_functional_dsession.py index bdedea0aa..18853d701 100644 --- a/py/test/dsession/testing/test_functional_dsession.py +++ b/py/test/dist/testing/test_functional_dsession.py @@ -1,5 +1,5 @@ import py -from py.__.test.dsession.dsession import DSession +from py.__.test.dist.dsession import DSession from test_txnode import EventQueue class TestAsyncFunctional: diff --git a/py/test/dsession/testing/test_mypickle.py b/py/test/dist/testing/test_mypickle.py similarity index 87% rename from py/test/dsession/testing/test_mypickle.py rename to py/test/dist/testing/test_mypickle.py index 50e47b620..2a9caade3 100644 --- a/py/test/dsession/testing/test_mypickle.py +++ b/py/test/dist/testing/test_mypickle.py @@ -1,6 +1,6 @@ import py -from py.__.test.dsession.mypickle import ImmutablePickler, PickleChannel, UnpickleError +from py.__.test.dist.mypickle import ImmutablePickler, PickleChannel, UnpickleError class A: pass @@ -75,9 +75,9 @@ class TestPickleChannelFunctional: def test_popen_send_instance(self): channel = self.gw.remote_exec(""" - from py.__.test.dsession.mypickle import PickleChannel + from py.__.test.dist.mypickle import PickleChannel channel = PickleChannel(channel) - from py.__.test.dsession.testing.test_mypickle import A + from py.__.test.dist.testing.test_mypickle import A a1 = A() a1.hello = 10 channel.send(a1) @@ -94,9 +94,9 @@ class TestPickleChannelFunctional: def test_send_concurrent(self): channel = self.gw.remote_exec(""" - from py.__.test.dsession.mypickle import PickleChannel + from py.__.test.dist.mypickle import PickleChannel 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)] channel.send(l) other_l = channel.receive() @@ -124,9 +124,9 @@ class TestPickleChannelFunctional: def test_popen_with_callback(self): channel = self.gw.remote_exec(""" - from py.__.test.dsession.mypickle import PickleChannel + from py.__.test.dist.mypickle import PickleChannel channel = PickleChannel(channel) - from py.__.test.dsession.testing.test_mypickle import A + from py.__.test.dist.testing.test_mypickle import A a1 = A() a1.hello = 10 channel.send(a1) @@ -145,9 +145,9 @@ class TestPickleChannelFunctional: def test_popen_with_callback_with_endmarker(self): channel = self.gw.remote_exec(""" - from py.__.test.dsession.mypickle import PickleChannel + from py.__.test.dist.mypickle import PickleChannel channel = PickleChannel(channel) - from py.__.test.dsession.testing.test_mypickle import A + from py.__.test.dist.testing.test_mypickle import A a1 = A() a1.hello = 10 channel.send(a1) @@ -169,9 +169,9 @@ class TestPickleChannelFunctional: def test_popen_with_callback_with_endmarker_and_unpickling_error(self): channel = self.gw.remote_exec(""" - from py.__.test.dsession.mypickle import PickleChannel + from py.__.test.dist.mypickle import PickleChannel channel = PickleChannel(channel) - from py.__.test.dsession.testing.test_mypickle import A + from py.__.test.dist.testing.test_mypickle import A a1 = A() channel.send(a1) channel.send(a1) @@ -188,7 +188,7 @@ class TestPickleChannelFunctional: def test_popen_with_newchannel(self): channel = self.gw.remote_exec(""" - from py.__.test.dsession.mypickle import PickleChannel + from py.__.test.dist.mypickle import PickleChannel channel = PickleChannel(channel) newchannel = channel.receive() newchannel.send(42) @@ -202,7 +202,7 @@ class TestPickleChannelFunctional: def test_popen_with_various_methods(self): channel = self.gw.remote_exec(""" - from py.__.test.dsession.mypickle import PickleChannel + from py.__.test.dist.mypickle import PickleChannel channel = PickleChannel(channel) channel.receive() """) diff --git a/py/test/dsession/testing/test_nodemanage.py b/py/test/dist/testing/test_nodemanage.py similarity index 99% rename from py/test/dsession/testing/test_nodemanage.py rename to py/test/dist/testing/test_nodemanage.py index 1b680627e..631f5a2ea 100644 --- a/py/test/dsession/testing/test_nodemanage.py +++ b/py/test/dist/testing/test_nodemanage.py @@ -3,7 +3,7 @@ """ import py -from py.__.test.dsession.nodemanage import NodeManager +from py.__.test.dist.nodemanage import NodeManager from py.__.test import event diff --git a/py/test/dsession/testing/test_txnode.py b/py/test/dist/testing/test_txnode.py similarity index 98% rename from py/test/dsession/testing/test_txnode.py rename to py/test/dist/testing/test_txnode.py index b7e3df0e8..07442468b 100644 --- a/py/test/dsession/testing/test_txnode.py +++ b/py/test/dist/testing/test_txnode.py @@ -1,6 +1,6 @@ import py -from py.__.test.dsession.txnode import MasterNode +from py.__.test.dist.txnode import MasterNode class EventQueue: def __init__(self, bus, queue=None): diff --git a/py/test/dsession/txnode.py b/py/test/dist/txnode.py similarity index 95% rename from py/test/dsession/txnode.py rename to py/test/dist/txnode.py index c40bc8d9e..be4040c16 100644 --- a/py/test/dsession/txnode.py +++ b/py/test/dist/txnode.py @@ -3,7 +3,7 @@ """ import py from py.__.test import event -from py.__.test.dsession.mypickle import PickleChannel +from py.__.test.dist.mypickle import PickleChannel class MasterNode(object): """ Install slave code, manage sending test tasks & receiving results """ @@ -70,8 +70,8 @@ class MasterNode(object): # setting up slave code def install_slave(gateway, config): channel = gateway.remote_exec(source=""" - from py.__.test.dsession.mypickle import PickleChannel - from py.__.test.dsession.txnode import SlaveNode + from py.__.test.dist.mypickle import PickleChannel + from py.__.test.dist.txnode import SlaveNode channel = PickleChannel(channel) slavenode = SlaveNode(channel) slavenode.run() diff --git a/py/test/looponfail/remote.py b/py/test/looponfail/remote.py index e9d19c1d2..6e3b7295e 100644 --- a/py/test/looponfail/remote.py +++ b/py/test/looponfail/remote.py @@ -11,7 +11,7 @@ from __future__ import generators import py 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.looponfail import util @@ -70,7 +70,7 @@ class RemoteControl(object): finally: old.chdir() 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 channel = PickleChannel(channel) config, fullwidth, hasmarkup = channel.receive() diff --git a/py/test/plugin/pytest_default.py b/py/test/plugin/pytest_default.py index 7995f0aba..94d6691bc 100644 --- a/py/test/plugin/pytest_default.py +++ b/py/test/plugin/pytest_default.py @@ -135,7 +135,7 @@ class DefaultPlugin: from py.__.test.looponfail.remote import LooponfailingSession config.setsessionclass(LooponfailingSession) elif val("numprocesses") or val("dist"): - from py.__.test.dsession.dsession import DSession + from py.__.test.dist.dsession import DSession config.setsessionclass(DSession) def pytest_item_makereport(self, item, excinfo, when, outerr): diff --git a/py/test/runner.py b/py/test/runner.py index e858ea558..01beb31ea 100644 --- a/py/test/runner.py +++ b/py/test/runner.py @@ -10,7 +10,7 @@ import py, os, sys from py.__.test import event from py.__.test.outcome import Exit -from py.__.test.dsession.mypickle import ImmutablePickler +from py.__.test.dist.mypickle import ImmutablePickler import py.__.test.custompdb class RobustRun(object): diff --git a/py/test/testing/test_pickling.py b/py/test/testing/test_pickling.py index 285b382f1..9f188bda9 100644 --- a/py/test/testing/test_pickling.py +++ b/py/test/testing/test_pickling.py @@ -23,7 +23,7 @@ def pytest_pyfunc_call(__call__, pyfuncitem, args, kwargs): class ImmutablePickleTransport: def __init__(self): - from py.__.test.dsession.mypickle import ImmutablePickler + from py.__.test.dist.mypickle import ImmutablePickler self.p1 = ImmutablePickler(uneven=0) self.p2 = ImmutablePickler(uneven=1) @@ -168,11 +168,11 @@ class TestConfigPickling: old.chdir() 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() channel = gw.remote_exec(""" import py - from py.__.test.dsession.mypickle import PickleChannel + from py.__.test.dist.mypickle import PickleChannel channel = PickleChannel(channel) config = channel.receive() assert py.test.config.pytestplugins.pyplugins == py._com.pyplugins, "pyplugins wrong"