From 58e1693af0b33d7cfdab54afbe05f646a116529a Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 28 Oct 2009 21:33:26 +0100
Subject: [PATCH] fix a test-import issue occuring when there is a second
 'testing' directory in PYTHONPATH or so.

--HG--
branch : trunk
---
 testing/pytest/dist/test_mypickle.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testing/pytest/dist/test_mypickle.py b/testing/pytest/dist/test_mypickle.py
index 7597f5247..bf4e9c3fa 100644
--- a/testing/pytest/dist/test_mypickle.py
+++ b/testing/pytest/dist/test_mypickle.py
@@ -120,6 +120,11 @@ class TestPickleChannelFunctional:
     def setup_class(cls):
         cls.gw = execnet.PopenGateway()
         cls.gw.remote_init_threads(5)
+        # we need the remote test code to import 
+        # the same test module here
+        cls.gw.remote_exec(
+            "import py ; py.path.local(%r).pyimport()" %(__file__)
+        )
 
     def test_popen_send_instance(self):
         channel = self.gw.remote_exec("""