floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sorting should be an option collector->child interface

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Samuele Pedroni
2009-05-19 18:28:51 +02:00
parent 842d14cd33
commit 3b23b98cb5
5 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
py/test/testing/test_collect.py
View File

@@ -6,7 +6,7 @@ class TestCollector:
assert not issubclass(Collector, Item)
assert not issubclass(Item, Collector)
def test_check_equality_and_cmp_basic(self, testdir):
def test_check_equality(self, testdir):
modcol = testdir.getmodulecol("""
def test_pass(): pass
def test_fail(): assert 0
@@ -25,11 +25,7 @@ class TestCollector:
assert isinstance(fn3, py.test.collect.Function)
assert not (fn1 == fn3)
assert fn1 != fn3
assert cmp(fn1, fn3) == -1
assert cmp(fn1, 10) == -1
assert cmp(fn2, 10) == -1
assert cmp(fn3, 10) == -1
for fn in fn1,fn2,fn3:
assert fn != 3
assert fn != modcol

18
py/test/testing/test_pycollect.py
View File

@@ -269,7 +269,7 @@ class TestFunction:
assert not (f5 == f5b)
class TestSorting:
def test_check_equality_and_cmp_basic(self, testdir):
def test_check_equality(self, testdir):
modcol = testdir.getmodulecol("""
def test_pass(): pass
def test_fail(): assert 0
@@ -288,11 +288,7 @@ class TestSorting:
assert isinstance(fn3, py.test.collect.Function)
assert not (fn1 == fn3)
assert fn1 != fn3
assert cmp(fn1, fn3) == -1
assert cmp(fn1, 10) == -1
assert cmp(fn2, 10) == -1
assert cmp(fn3, 10) == -1
for fn in fn1,fn2,fn3:
assert fn != 3
assert fn != modcol
@@ -308,18 +304,18 @@ class TestSorting:
return g
def test_a(y):
pass
test_a = dec(test_a)
def test_b(y):
pass
test_b = dec(test_b)
def test_a(y):
pass
test_a = dec(test_a)
""")
colitems = modcol.collect()
assert len(colitems) == 2
f1, f2 = colitems
assert cmp(f2, f1) > 0
assert [item.name for item in colitems] == ['test_b', 'test_a']
class TestConftestCustomization:
def test_extra_python_files_and_functions(self, testdir):