[py-svn] r7121 - in py/dist: . py/test

[hpk at codespeak.net]

Author: hpk
Date: Mon Oct 25 22:15:43 2004
New Revision: 7121

Added:
   py/dist/conftest.py
      - copied unchanged from r7120, py/dist/pytestconf.py
Removed:
   py/dist/pytestconf.py
Modified:
   py/dist/py/test/cmdline.py
   py/dist/py/test/config.py
   py/dist/py/test/test_config.py
Log:
minor renaming and fix.  'conftest.py' does
not conflict with 'py' itself regarding 
tab-completion anymore :-) 



Modified: py/dist/py/test/cmdline.py
==============================================================================
--- py/dist/py/test/cmdline.py	(original)
+++ py/dist/py/test/cmdline.py	Mon Oct 25 22:15:43 2004
@@ -2,11 +2,11 @@
 import py 
 import sys
 from py.__impl__.execnet.channel import ChannelFile, receive2file 
+from py.__impl__.test.config import configbasename 
 
 #
 # main entry point
 #
-configbasename = 'pytestconf.py' 
 
 def old(argv): 
     if argv is None:

Modified: py/dist/py/test/config.py
==============================================================================
--- py/dist/py/test/config.py	(original)
+++ py/dist/py/test/config.py	Mon Oct 25 22:15:43 2004
@@ -10,7 +10,7 @@
 #
 # config file handling (utest.conf)
 #
-configbasename = 'pytestconf.py' 
+configbasename = 'conftest.py' 
 
 class Config:
     def __init__(self):

Modified: py/dist/py/test/test_config.py
==============================================================================
--- py/dist/py/test/test_config.py	(original)
+++ py/dist/py/test/test_config.py	Mon Oct 25 22:15:43 2004
@@ -30,9 +30,9 @@
 def test_config_order():
     from py.__impl__.test import config 
     o = py.test.config.tmpdir.ensure('configorder', dir=1)
-    o.ensure('pytestconf.py').write('x=1 ; import py ; py._x = [x]') 
-    o.ensure('a/pytestconf.py').write('x=2 ; import py ; py._x.append(x)')
-    o.ensure('a/b/c/pytestconf.py').write('x=3 ; import py ; py._x.append(x)')
+    o.ensure('conftest.py').write('x=1 ; import py ; py._x = [x]') 
+    o.ensure('a/conftest.py').write('x=2 ; import py ; py._x.append(x)')
+    o.ensure('a/b/c/conftest.py').write('x=3 ; import py ; py._x.append(x)')
     cfg = config.Config() 
     cfg.readconfiguration(o) 
     assert cfg.getfirst('x') == 1

Deleted: /py/dist/pytestconf.py
==============================================================================
--- /py/dist/pytestconf.py	Mon Oct 25 22:15:43 2004
+++ (empty file)
@@ -1,20 +0,0 @@
-#pythonexecutables = ('python2.2', 'python2.3',) 
-#pythonexecutable = 'python2.2' 
-
-# in the future we want to be able to say here: 
-#def setup_module(extpy):
-#    mod = extpy.resolve() 
-#    mod.module = 23
-#    directory = pypath.root.dirpath()
-
-import py
-rootdir = py.magic.autopath().dirpath()
-    
-# default values for options (modified from cmdline) 
-verbose = 0 
-nocapture = False 
-collectonly = False 
-exitfirstproblem = False 
-fulltrace = False 
-showlocals = False
-nomagic = False