[py-svn] r57321 - in py/trunk/py: . bin c-extension code code/testing compat doc green io io/testing misc misc/testing test test/dsession test/dsession/testing test/report test/report/testing test/testing
hpk at codespeak.net
hpk at codespeak.net
Sat Aug 16 17:27:03 CEST 2008
Author: hpk
Date: Sat Aug 16 17:26:59 2008
New Revision: 57321
Added:
py/trunk/py/c-extension/__init__.py
py/trunk/py/code/
- copied from r57305, py/branch/event/py/code/
py/trunk/py/code/testing/test_excinfo.py
- copied unchanged from r57306, py/branch/event/py/code/testing/test_excinfo.py
py/trunk/py/code/testing/test_source.py
- copied unchanged from r57317, py/branch/event/py/code/testing/test_source.py
py/trunk/py/doc/
- copied from r57305, py/branch/event/py/doc/
py/trunk/py/doc/code.txt
- copied unchanged from r57306, py/branch/event/py/doc/code.txt
py/trunk/py/doc/conftest.py
- copied unchanged from r57316, py/branch/event/py/doc/conftest.py
py/trunk/py/doc/future.txt
- copied unchanged from r57316, py/branch/event/py/doc/future.txt
py/trunk/py/doc/path.txt
- copied unchanged from r57316, py/branch/event/py/doc/path.txt
py/trunk/py/doc/test_conftest.py
- copied unchanged from r57306, py/branch/event/py/doc/test_conftest.py
py/trunk/py/doc/why_py.txt
- copied unchanged from r57316, py/branch/event/py/doc/why_py.txt
py/trunk/py/io/
- copied from r57305, py/branch/event/py/io/
py/trunk/py/io/forkedfunc.py
- copied unchanged from r57306, py/branch/event/py/io/forkedfunc.py
py/trunk/py/io/testing/test_forkedfunc.py
- copied unchanged from r57306, py/branch/event/py/io/testing/test_forkedfunc.py
py/trunk/py/io/testing/test_terminalwriter.py
- copied unchanged from r57306, py/branch/event/py/io/testing/test_terminalwriter.py
py/trunk/py/misc/
- copied from r57305, py/branch/event/py/misc/
py/trunk/py/misc/_dist.py
- copied unchanged from r57319, py/branch/event/py/misc/_dist.py
py/trunk/py/misc/conftest-socketgatewayrun.py
- copied unchanged from r57306, py/branch/event/py/misc/conftest-socketgatewayrun.py
py/trunk/py/misc/testing/test_initpkg.py
- copied unchanged from r57306, py/branch/event/py/misc/testing/test_initpkg.py
py/trunk/py/test/
- copied from r57306, py/branch/event/py/test/
py/trunk/py/test/collect.py
- copied unchanged from r57313, py/branch/event/py/test/collect.py
py/trunk/py/test/config.py
- copied unchanged from r57315, py/branch/event/py/test/config.py
py/trunk/py/test/dsession/dsession.py
- copied unchanged from r57311, py/branch/event/py/test/dsession/dsession.py
py/trunk/py/test/dsession/testing/test_functional_dsession.py
- copied unchanged from r57315, py/branch/event/py/test/dsession/testing/test_functional_dsession.py
py/trunk/py/test/event.py
- copied unchanged from r57311, py/branch/event/py/test/event.py
py/trunk/py/test/pycollect.py
- copied unchanged from r57309, py/branch/event/py/test/pycollect.py
py/trunk/py/test/report/terminal.py
- copied unchanged from r57311, py/branch/event/py/test/report/terminal.py
py/trunk/py/test/report/testing/test_collectonly.py
- copied unchanged from r57311, py/branch/event/py/test/report/testing/test_collectonly.py
py/trunk/py/test/testing/acceptance_test.py
- copied unchanged from r57311, py/branch/event/py/test/testing/acceptance_test.py
py/trunk/py/test/testing/test_collect.py
- copied unchanged from r57314, py/branch/event/py/test/testing/test_collect.py
py/trunk/py/test/testing/test_config.py
- copied unchanged from r57315, py/branch/event/py/test/testing/test_config.py
Removed:
py/trunk/py/misc/_maketest2.py
Modified:
py/trunk/py/__init__.py
py/trunk/py/bin/_findpy.py
py/trunk/py/compat/conftest.py
py/trunk/py/green/conftest.py
Log:
merging the event branch:
* moving in test, misc, code, io directories and
py/__init__.py
* py/bin/_find.py does not print to stderr anymore
* a few fixes to conftest files in other dirs
some more fixes and adjustments pending
Modified: py/trunk/py/__init__.py
==============================================================================
--- py/trunk/py/__init__.py (original)
+++ py/trunk/py/__init__.py Sat Aug 16 17:26:59 2008
@@ -26,11 +26,11 @@
exportdefs = {
# helpers for use from test functions or collectors
'test.__doc__' : ('./test/__init__.py', '__doc__'),
- 'test.raises' : ('./test/raises.py', 'raises'),
- 'test.deprecated_call' : ('./test/deprecate.py', 'deprecated_call'),
- 'test.skip' : ('./test/item.py', 'skip'),
- 'test.fail' : ('./test/item.py', 'fail'),
- 'test.exit' : ('./test/session.py', 'exit'),
+ 'test.raises' : ('./test/outcome.py', 'raises'),
+ 'test.deprecated_call' : ('./test/outcome.py', 'deprecated_call'),
+ 'test.skip' : ('./test/outcome.py', 'skip'),
+ 'test.fail' : ('./test/outcome.py', 'fail'),
+ 'test.exit' : ('./test/outcome.py', 'exit'),
'test.pdb' : ('./test/custompdb.py', 'set_trace'),
# configuration/initialization related test api
@@ -41,13 +41,13 @@
# for customization of collecting/running tests
'test.collect.Collector' : ('./test/collect.py', 'Collector'),
'test.collect.Directory' : ('./test/collect.py', 'Directory'),
- 'test.collect.Module' : ('./test/collect.py', 'Module'),
- 'test.collect.DoctestFile' : ('./test/collect.py', 'DoctestFile'),
- 'test.collect.Class' : ('./test/collect.py', 'Class'),
- 'test.collect.Instance' : ('./test/collect.py', 'Instance'),
- 'test.collect.Generator' : ('./test/collect.py', 'Generator'),
- 'test.collect.Item' : ('./test/item.py', 'Item'),
- 'test.collect.Function' : ('./test/item.py', 'Function'),
+ 'test.collect.Module' : ('./test/pycollect.py', 'Module'),
+ 'test.collect.DoctestFile' : ('./test/pycollect.py', 'DoctestFile'),
+ 'test.collect.Class' : ('./test/pycollect.py', 'Class'),
+ 'test.collect.Instance' : ('./test/pycollect.py', 'Instance'),
+ 'test.collect.Generator' : ('./test/pycollect.py', 'Generator'),
+ 'test.collect.Item' : ('./test/collect.py', 'Item'),
+ 'test.collect.Function' : ('./test/pycollect.py', 'Function'),
# thread related API (still in early design phase)
'_thread.WorkerPool' : ('./thread/pool.py', 'WorkerPool'),
@@ -93,6 +93,7 @@
'builtin.sorted' : ('./builtin/sorted.py', 'sorted'),
'builtin.BaseException' : ('./builtin/exception.py', 'BaseException'),
'builtin.GeneratorExit' : ('./builtin/exception.py', 'GeneratorExit'),
+ 'builtin.sysex' : ('./builtin/exception.py', 'sysex'),
'builtin.set' : ('./builtin/set.py', 'set'),
'builtin.frozenset' : ('./builtin/set.py', 'frozenset'),
@@ -111,6 +112,8 @@
'io.FDCapture' : ('./io/fdcapture.py', 'FDCapture'),
'io.StdCapture' : ('./io/stdcapture.py', 'StdCapture'),
'io.StdCaptureFD' : ('./io/stdcapture.py', 'StdCaptureFD'),
+ 'io.TerminalWriter' : ('./io/terminalwriter.py', 'TerminalWriter'),
+ 'io.ForkedFunc' : ('./io/forkedfunc.py', 'ForkedFunc'),
# error module, defining all errno's as Classes
'error' : ('./misc/error.py', 'error'),
Modified: py/trunk/py/bin/_findpy.py
==============================================================================
--- py/trunk/py/bin/_findpy.py (original)
+++ py/trunk/py/bin/_findpy.py Sat Aug 16 17:26:59 2008
@@ -19,7 +19,7 @@
# if p == current:
# return True
if current != sys.path[0]: # if we are already first, then ok
- print >>sys.stderr, "inserting into sys.path:", current
+ #print >>sys.stderr, "inserting into sys.path:", current
sys.path.insert(0, current)
return True
current = opd(current)
Added: py/trunk/py/c-extension/__init__.py
==============================================================================
--- (empty file)
+++ py/trunk/py/c-extension/__init__.py Sat Aug 16 17:26:59 2008
@@ -0,0 +1 @@
+#
Modified: py/trunk/py/compat/conftest.py
==============================================================================
--- py/trunk/py/compat/conftest.py (original)
+++ py/trunk/py/compat/conftest.py Sat Aug 16 17:26:59 2008
@@ -1,5 +1,5 @@
import py
class Directory(py.test.collect.Directory):
- def run(self):
+ def listdir(self):
py.test.skip("compat tests currently need to be run manually")
Modified: py/trunk/py/green/conftest.py
==============================================================================
--- py/trunk/py/green/conftest.py (original)
+++ py/trunk/py/green/conftest.py Sat Aug 16 17:26:59 2008
@@ -1,8 +1,8 @@
import py, os
class Directory(py.test.collect.Directory):
- def run(self):
+ def listdir(self):
if os.name == 'nt':
py.test.skip("Cannot test green layer on windows")
else:
- return super(Directory, self).run()
+ return super(Directory, self).listdir()
Deleted: /py/branch/event/py/misc/_maketest2.py
==============================================================================
--- /py/branch/event/py/misc/_maketest2.py Sat Aug 16 17:26:59 2008
+++ (empty file)
@@ -1,53 +0,0 @@
-""" create a py/test2 hierarchy copied from py/test.
- useful for refactoring py.test itself and still
- use py.test itself.
-"""
-
-from _findpy import py
-
-def change_init(initfile):
- l = []
- for line in initfile.readlines():
- newline = line
- l.append(line)
- newline = newline.replace("'test.", "'test2.")
- newline = newline.replace("'./test/", "'./test2/")
- if newline != line:
- l.append(newline)
- initfile.write("".join(l))
-
-def perform_replace(directory):
- for x in directory.visit("*.py",
- rec=lambda x: x.check(dir=1, dotfile=0)):
- s = n = x.read()
- n = n.replace("py.test", "py.test2")
- n = n.replace("py.__.test.", "py.__.test2.")
- n = n.replace("py.__.test ", "py.__.test2 ")
- if s != n:
- print "writing modified", x
- x.write(n)
-
-def cmd(command):
- print "* executing:", command
- return py.process.cmdexec(command)
-
-if __name__ == '__main__':
- basedir = py.path.local(py.__file__).dirpath()
- #st = py.path.svnwc(basedir).status()
- #assert not st.modified
- olddir = basedir.chdir()
- try:
- initfile = basedir.join("__init__.py")
- cmd("svn revert %s" % initfile)
- change_init(initfile)
-
- test2dir = basedir.join("test2")
- cmd("svn revert -R test2")
- cmd("rm -rf test2")
- cmd("svn cp test test2")
- perform_replace(test2dir)
-
- finally:
- olddir.chdir()
-
-
More information about the pytest-commit
mailing list