[svn r38217] Moved the -S option to a new conftest.py in the execnet dir to avoid nasty

option re-definition problems.

--HG--
branch : trunk

py/conftest.py

@@ -15,15 +15,4 @@ exitfirst = False
 fulltrace = False
 showlocals = False
 nomagic = False
-
-import py
-Option = py.test.config.Option
-
-option = py.test.config.addoptions("execnet options",
-        Option('-S', '',
-               action="store", dest="sshtarget", default=None,
-               help=("target to run tests requiring ssh, e.g. "
-                     "user@codespeak.net")),
-    )
-
 dist_rsync_roots = ['.']

py/execnet/conftest.py

@@ -0,0 +1,10 @@
+import py
+Option = py.test.config.Option
+
+option = py.test.config.addoptions("execnet options",
+        Option('-S', '',
+               action="store", dest="sshtarget", default=None,
+               help=("target to run tests requiring ssh, e.g. "
+                     "user@codespeak.net")),
+    )
+

py/execnet/testing/test_gateway.py

@@ -2,7 +2,7 @@ from __future__ import generators
 import os, sys, time, signal
 import py
 from py.__.execnet import gateway
-from py.__.conftest import option 
+from py.__.execnet.conftest import option 
 mypath = py.magic.autopath()
 
 from StringIO import StringIO

py/misc/conftest-socketgatewayrun.py

@@ -16,15 +16,6 @@ from py.__.test.terminal.remote import RemoteTerminalSession
 
 import os
 
-Option = py.test.config.Option
-
-option = py.test.config.addoptions("execnet options",
-        Option('-S', '',
-               action="store", dest="sshtarget", default=None,
-               help=("target to run tests requiring ssh, e.g. "
-                     "user@codespeak.net")),
-    )
-
 class MyRSync(py.execnet.RSync):
     def filter(self, path):
         if path.endswith('.pyc') or path.endswith('~'):