[py-svn] r10521 - py/branch/py-collect/test

[hpk at codespeak.net]

Author: hpk
Date: Sun Apr 10 22:36:55 2005
New Revision: 10521

Added:
   py/branch/py-collect/test/defaultconftest.py
      - copied unchanged from r10520, py/branch/py-collect/test/defaultconfig.py
Removed:
   py/branch/py-collect/test/defaultconfig.py
Modified:
   py/branch/py-collect/test/config.py
Log:
internal rename 


Modified: py/branch/py-collect/test/config.py
==============================================================================
--- py/branch/py-collect/test/config.py	(original)
+++ py/branch/py-collect/test/config.py	Sun Apr 10 22:36:55 2005
@@ -3,7 +3,7 @@
 import py
 from py.__impl__.test.tool import optparse
 
-defaultconfig = py.magic.autopath().dirpath('defaultconfig.py')
+defaultconfig = py.magic.autopath().dirpath('defaultconftest.py')
 dummy = object()
 
 #

Deleted: /py/branch/py-collect/test/defaultconfig.py
==============================================================================
--- /py/branch/py-collect/test/defaultconfig.py	Sun Apr 10 22:36:55 2005
+++ (empty file)
@@ -1,60 +0,0 @@
-import py
-Option = py.test.Config.Option
-
-TerminalSession = py.test.TerminalSession 
-TkinterSession = py.test.TkinterSession 
-
-Module = py.test.collect.Module 
-Directory = py.test.collect.Directory
-Class = py.test.collect.Class
-Generator = py.test.collect.Generator 
-Function = py.test.Function 
-Instance = py.test.collect.Instance 
-
-additionalinfo = None
-
-def adddefaultoptions(): 
-    py.test.Config.addoptions('general options',
-        Option('-v', '--verbose',
-               action="count", dest="verbose", default=0,
-               help="increase verbosity"),
-        Option('-x', '--exitfirst',
-               action="store_true", dest="exitfirstproblem", default=False,
-               help="exit instantly on first error or failed test."),
-        Option('', '--pdb',
-               action="store_true", dest="usepdb", default=False,
-               help="start pdb (the Python debugger) on errors."),
-        Option('-s', '--nocapture',
-               action="store_true", dest="nocapture", default=False,
-               help="disable catching of sys.stdout/stderr output."),
-        Option('-l', '--showlocals',
-               action="store_true", dest="showlocals", default=False,
-               help="show locals in tracebacks (disabled by default)"),
-        Option('', '--exec',
-               action="store", dest="executable", default=None,
-               help="python executable to run the tests with. "),
-        Option('', '--fulltrace',
-               action="store_true", dest="fulltrace", default=False,
-               help="don't cut any tracebacks (default is to cut)"),
-        Option('', '--nomagic',
-               action="store_true", dest="nomagic", default=False,
-               help="refrain from using magic as much as possible"), 
-        Option('', '--collectonly',
-               action="store_true", dest="collectonly", default=False,
-               help="only collect tests, don't execute them. "),
-        Option('', '--traceconfig',
-               action="store_true", dest="traceconfig", default=False,
-               help="trace considerations of conftest.py files. "), 
-    )
-    py.test.Config.addoptions('test-session related options', 
-        Option('', '--tkinter',
-               action="store_true", dest="tkinter", default=False,
-               help="use tkinter test session frontend."), 
-        Option('', '--looponfailing',
-               action="store_true", dest="looponfailing", default=False,
-               help="loop on failing tests (running in a separate process)."), 
-        Option('', '--session', 
-               action="store", dest="session", default=None, 
-               help="use given sessionclass, default is terminal."),
-    )
-