[py-svn] r10307 - in py/branch/py-collect: . c-extension test test/testing test/tkinter
hpk at codespeak.net
hpk at codespeak.net
Mon Apr 4 22:31:34 CEST 2005
Author: hpk
Date: Mon Apr 4 22:31:33 2005
New Revision: 10307
Modified:
py/branch/py-collect/__init__.py
py/branch/py-collect/c-extension/conftest.py
py/branch/py-collect/test/defaultconfig.py
py/branch/py-collect/test/item.py
py/branch/py-collect/test/run.py
py/branch/py-collect/test/terminal.py
py/branch/py-collect/test/testing/test_collect.py
py/branch/py-collect/test/tkinter/ (props changed)
py/branch/py-collect/test/tkinter/__init__.py (props changed)
py/branch/py-collect/test/tkinter/gui.py (contents, props changed)
py/branch/py-collect/test/tkinter/guidriver.py (contents, props changed)
py/branch/py-collect/test/tkinter/repository.py (contents, props changed)
py/branch/py-collect/test/tkinter/test_exceptionfailure.py (props changed)
py/branch/py-collect/test/tkinter/test_guidriver.py (contents, props changed)
py/branch/py-collect/test/tkinter/test_repository.py (props changed)
py/branch/py-collect/test/tkinter/test_util.py (contents, props changed)
py/branch/py-collect/test/tkinter/tkgui.py (contents, props changed)
py/branch/py-collect/test/tkinter/tktree.py (props changed)
py/branch/py-collect/test/tkinter/util.py (contents, props changed)
Log:
- moved primary Collector Classes into
the py.test.collect namespace (which is the
same location as they have with the trunk)
- fixed tkinter gui to run on python2.3
(don't use decorator syntax in the py lib, please :-)
Modified: py/branch/py-collect/__init__.py
==============================================================================
--- py/branch/py-collect/__init__.py (original)
+++ py/branch/py-collect/__init__.py Mon Apr 4 22:31:33 2005
@@ -16,12 +16,12 @@
'test.compat.TestCase' : ('./test/compat.py', 'TestCase'),
- 'test.Collector' : ('./test/collect.py', 'Collector'),
- 'test.Directory' : ('./test/collect.py', 'Directory'),
- 'test.Module' : ('./test/collect.py', 'Module'),
- 'test.Class' : ('./test/collect.py', 'Class'),
- 'test.Instance' : ('./test/collect.py', 'Instance'),
- 'test.Generator' : ('./test/collect.py', 'Generator'),
+ 'test.collect.Collector' : ('./test/collect.py', 'Collector'),
+ 'test.collect.Directory' : ('./test/collect.py', 'Directory'),
+ 'test.collect.Module' : ('./test/collect.py', 'Module'),
+ 'test.collect.Class' : ('./test/collect.py', 'Class'),
+ 'test.collect.Instance' : ('./test/collect.py', 'Instance'),
+ 'test.collect.Generator' : ('./test/collect.py', 'Generator'),
'test.Item' : ('./test/item.py', 'Item'),
'test.Function' : ('./test/item.py', 'Function'),
Modified: py/branch/py-collect/c-extension/conftest.py
==============================================================================
--- py/branch/py-collect/c-extension/conftest.py (original)
+++ py/branch/py-collect/c-extension/conftest.py Mon Apr 4 22:31:33 2005
@@ -1,6 +1,6 @@
import py
-class Directory(py.test.Directory):
+class Directory(py.test.collect.Directory):
# XXX see in which situations/platforms we want
# run tests here
#def recfilter(self, path):
Modified: py/branch/py-collect/test/defaultconfig.py
==============================================================================
--- py/branch/py-collect/test/defaultconfig.py (original)
+++ py/branch/py-collect/test/defaultconfig.py Mon Apr 4 22:31:33 2005
@@ -3,12 +3,12 @@
Driver = py.test.TerminalDriver
-Module = py.test.Module
-Directory = py.test.Directory
-Class = py.test.Class
-Generator = py.test.Generator
+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.Instance
+Instance = py.test.collect.Instance
additionalinfo = None
Modified: py/branch/py-collect/test/item.py
==============================================================================
--- py/branch/py-collect/test/item.py (original)
+++ py/branch/py-collect/test/item.py Mon Apr 4 22:31:33 2005
@@ -29,7 +29,7 @@
col.setup()
self.stack.append(col)
-class Item(py.test.Collector):
+class Item(py.test.collect.Collector):
state = SetupState()
class Function(Item):
Modified: py/branch/py-collect/test/run.py
==============================================================================
--- py/branch/py-collect/test/run.py (original)
+++ py/branch/py-collect/test/run.py Mon Apr 4 22:31:33 2005
@@ -28,7 +28,7 @@
changed = True
return changed
-class FailingCollector(py.test.Collector):
+class FailingCollector(py.test.collect.Collector):
def __init__(self, faileditems):
self._faileditems = faileditems
@@ -101,16 +101,16 @@
failures = driver.run(cols)
channel.send(failures)
-class FailureCollector(py.test.Collector):
+class FailureCollector(py.test.collect.Collector):
def __init__(self, failures):
self.failures = failures
def __iter__(self):
for rootpath, names in self.failures:
root = py.path.local(rootpath)
if root.check(dir=1):
- current = py.test.Directory(root).Directory(root)
+ current = py.test.collect.Directory(root).Directory(root)
elif root.check(file=1):
- current = py.test.Module(root).Module(root)
+ current = py.test.collect.Module(root).Module(root)
# root is fspath of names[0] -> pop names[0]
# slicing works with empty lists
names = names[1:]
Modified: py/branch/py-collect/test/terminal.py
==============================================================================
--- py/branch/py-collect/test/terminal.py (original)
+++ py/branch/py-collect/test/terminal.py Mon Apr 4 22:31:33 2005
@@ -90,7 +90,7 @@
if self.option.exitfirstproblem:
py.test.exit("exit on first problem configured.", item=colitem)
if result is None or not isinstance(colitem, py.test.Item):
- if isinstance(colitem, py.test.Module) and self.option.verbose == 0:
+ if isinstance(colitem, py.test.collect.Module) and self.option.verbose == 0:
self.out.line()
return
else:
@@ -264,7 +264,7 @@
try:
fn, lineno = item.getpathlineno()
except TypeError:
- assert isinstance(item.parent, py.test.Generator)
+ assert isinstance(item.parent, py.test.collect.Generator)
# a generative test yielded a non-callable
fn, lineno = item.parent.getpathlineno()
if fn != entry.frame.code.path or \
Modified: py/branch/py-collect/test/testing/test_collect.py
==============================================================================
--- py/branch/py-collect/test/testing/test_collect.py (original)
+++ py/branch/py-collect/test/testing/test_collect.py Mon Apr 4 22:31:33 2005
@@ -6,7 +6,7 @@
def test_failing_import_execfile():
fn = datadir / 'failingimport.py'
- col = py.test.Module(fn)
+ col = py.test.collect.Module(fn)
def _import():
py.test.raises(ImportError, col.run)
_import()
@@ -14,9 +14,9 @@
def XXXtest_finds_root():
fn = datadir / 'filetest.py'
- col = py.test.Module(fn)
+ col = py.test.collect.Module(fn)
root, namelist = col.fromroot()
- assert isinstance(root, py.test.Directory)
+ assert isinstance(root, py.test.collect.Directory)
cur = root
for x in namelist:
cur = cur.join(x)
@@ -26,7 +26,7 @@
def test_finds_tests():
fn = datadir / 'filetest.py'
- col = py.test.Module(fn)
+ col = py.test.collect.Module(fn)
l = col.run()
assert len(l) == 2
items = list(col.iteritems())
@@ -37,28 +37,28 @@
assert l[1].fspath == fn
def test_failing_import_directory():
- class MyDirectory(py.test.Directory):
+ class MyDirectory(py.test.collect.Directory):
filefilter = py.path.checker(fnmatch='testspecial*.py')
l = MyDirectory(datadir).run()
assert len(l) == 1
- assert isinstance(l[0], py.test.Module)
+ assert isinstance(l[0], py.test.collect.Module)
py.test.raises(ImportError, l[0].run)
def test_module_file_not_found():
fn = datadir.join('nada','no')
- col = py.test.Module(fn)
+ col = py.test.collect.Module(fn)
py.test.raises(py.error.ENOENT, col.run)
def test_syntax_error_in_module():
modpath = py.path.extpy(datadir.join('syntax_error.py'))
- col = py.test.Module(modpath)
+ col = py.test.collect.Module(modpath)
py.test.raises(SyntaxError, col.run)
def test_disabled_class():
- col = py.test.Module(datadir.join('disabled.py'))
+ col = py.test.collect.Module(datadir.join('disabled.py'))
l = col.run()
assert len(l) == 1
- assert isinstance(l[0], py.test.Class)
+ assert isinstance(l[0], py.test.collect.Class)
assert not l[0].run()
class Testsomeclass:
@@ -94,13 +94,13 @@
yield func1, 17, 3*5
yield func1, 42, 6*7
"""))
- col = py.test.Module(tfile)
+ col = py.test.collect.Module(tfile)
l = col.run()
assert len(l) == 2
generator = l[0]
print l
- assert isinstance(generator, py.test.Generator)
+ assert isinstance(generator, py.test.collect.Generator)
l2 = generator.run()
assert len(l2) == 2
assert isinstance(l2[0], py.test.Function)
@@ -113,7 +113,7 @@
classlist = l[1].run()
assert len(classlist) == 1
generator = classlist[0].run()[0]
- assert isinstance(generator, py.test.Generator)
+ assert isinstance(generator, py.test.collect.Generator)
l2 = generator.run()
assert len(l2) == 2
assert isinstance(l2[0], py.test.Function)
@@ -127,7 +127,7 @@
import py
class MyFunction(py.test.Function):
pass
- class Directory(py.test.Directory):
+ class Directory(py.test.collect.Directory):
def filefilter(self, fspath):
return fspath.check(basestarts='check_')
class myfuncmixin:
@@ -135,10 +135,10 @@
def funcnamefilter(self, name):
return name.startswith('check_')
- class Module(myfuncmixin, py.test.Module):
+ class Module(myfuncmixin, py.test.collect.Module):
def classnamefilter(self, name):
return name.startswith('CustomTestClass')
- class Instance(myfuncmixin, py.test.Instance):
+ class Instance(myfuncmixin, py.test.collect.Instance):
pass
""")
o.ensure('somedir', 'check_something').write("""if 1:
Modified: py/branch/py-collect/test/tkinter/gui.py
==============================================================================
--- py/branch/py-collect/test/tkinter/gui.py (original)
+++ py/branch/py-collect/test/tkinter/gui.py Mon Apr 4 22:31:33 2005
@@ -3,7 +3,7 @@
from Tkinter import PhotoImage
import py
Item = py.test.Item
-Collector = py.test.Collector
+Collector = py.test.collect.Collector
class ResultTree(Tree):
Modified: py/branch/py-collect/test/tkinter/guidriver.py
==============================================================================
--- py/branch/py-collect/test/tkinter/guidriver.py (original)
+++ py/branch/py-collect/test/tkinter/guidriver.py Mon Apr 4 22:31:33 2005
@@ -22,7 +22,7 @@
py.test.Item.Skipped,
py.test.Item.Failed)):
print '!' *80
- print 'py.test.Collector.Outcome found'
+ print 'py.test.item.Outcome found'
print '!' *80
print '-' * 60
Modified: py/branch/py-collect/test/tkinter/repository.py
==============================================================================
--- py/branch/py-collect/test/tkinter/repository.py (original)
+++ py/branch/py-collect/test/tkinter/repository.py Mon Apr 4 22:31:33 2005
@@ -1,8 +1,6 @@
import py
Item = py.test.Item
-Collector = py.test.Collector
-
-
+Collector = py.test.collect.Collector
import copy
import time
Modified: py/branch/py-collect/test/tkinter/test_guidriver.py
==============================================================================
--- py/branch/py-collect/test/tkinter/test_guidriver.py (original)
+++ py/branch/py-collect/test/tkinter/test_guidriver.py Mon Apr 4 22:31:33 2005
@@ -49,7 +49,7 @@
## def test_status_is_passed_to_root(self):
## self.driver.header(self.collitems)
## self.driver.start(self.collitems[0])
-## self.driver.finish(self.collitems[0], py.test.Collector.Failed())
+## self.driver.finish(self.collitems[0], py.test.collect.Collector.Failed())
## self.driver.footer(self.collitems)
## assert self.channel.sendlist[-1] is None
Modified: py/branch/py-collect/test/tkinter/test_util.py
==============================================================================
--- py/branch/py-collect/test/tkinter/test_util.py (original)
+++ py/branch/py-collect/test/tkinter/test_util.py Mon Apr 4 22:31:33 2005
@@ -58,7 +58,7 @@
def setup_method(self, method):
self.path = py.path.local()
- self.collector = py.test.Directory(self.path)
+ self.collector = py.test.collect.Directory(self.path)
self.testresult = TestReport()
def test_start(self):
@@ -80,7 +80,7 @@
## def test_finish_failed(self):
## self.testresult.start(self.collector)
-## self.testresult.finish(self.collector, py.test.Collector.Failed())
+## self.testresult.finish(self.collector, py.test.collect.Collector.Failed())
## assert self.testresult.status == Status.Failed()
Modified: py/branch/py-collect/test/tkinter/tkgui.py
==============================================================================
--- py/branch/py-collect/test/tkinter/tkgui.py (original)
+++ py/branch/py-collect/test/tkinter/tkgui.py Mon Apr 4 22:31:33 2005
@@ -12,7 +12,7 @@
import py
from py.test import Driver
Item = py.test.Item
-Collector = py.test.Collector
+Collector = py.test.collect.Collector
import repository
import util
Modified: py/branch/py-collect/test/tkinter/util.py
==============================================================================
--- py/branch/py-collect/test/tkinter/util.py (original)
+++ py/branch/py-collect/test/tkinter/util.py Mon Apr 4 22:31:33 2005
@@ -25,21 +25,25 @@
class Status(object):
- @classmethod
def NotExecuted(cls):
return cls('NotExecuted')
- @classmethod
+ NotExecuted = classmethod(NotExecuted)
+
def Passed(cls):
return cls('Passed')
- @classmethod
+ Passed = classmethod(Passed)
+
def Failed(cls):
return cls('Failed')
- @classmethod
+ Failed = classmethod(Failed)
+
def Skipped(cls):
return cls('Skipped')
- @classmethod
+ Skipped = classmethod(Skipped)
+
def ExceptionFailure(cls):
return cls(_ExceptionFailure)
+ ExceptionFailure = classmethod(ExceptionFailure)
ordered_list = [_NotExecuted,
_Passed,
@@ -55,7 +59,7 @@
def __init__(self, outcome_or_name = ''):
self.str = _NotExecuted
- if isinstance(outcome_or_name, py.test.Collector.Outcome):
+ if isinstance(outcome_or_name, py.test.Item.Outcome):
# hack
if isinstance(outcome_or_name, py.test.Item.ExceptionFailure):
self.str = self.namemap[py.test.Item.ExceptionFailure]
@@ -118,12 +122,11 @@
'finished': False,
'restart_params': None, # ('',('',))
}
- @classmethod
def fromChannel(cls, kwdict):
if 'status' in kwdict:
kwdict['status'] = Status(kwdict['status'])
return cls(**kwdict)
-
+ fromChannel = classmethod(fromChannel)
def __init__(self, **kwargs):
# copy status -> deepcopy
More information about the pytest-commit
mailing list