Commits

Anonymous committed c1c560e

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

  • Participants
  • Parent commits 9d7e03b

Comments (0)

Files changed (2)

execnet/conftest.py

+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")),
+    )
+

execnet/testing/test_gateway.py

 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