[svn r62985] rewrite and fix a skipped test
--HG-- branch : trunk
This commit is contained in:
parent
009ac242c6
commit
6397c38725
|
@ -60,6 +60,8 @@ class Session(object):
|
||||||
for x in self.genitems(ev.result, keywordexpr):
|
for x in self.genitems(ev.result, keywordexpr):
|
||||||
yield x
|
yield x
|
||||||
notify("collectionreport", ev)
|
notify("collectionreport", ev)
|
||||||
|
if self.shouldstop:
|
||||||
|
break
|
||||||
|
|
||||||
def filteritems(self, colitems):
|
def filteritems(self, colitems):
|
||||||
""" return items to process (some may be deselected)"""
|
""" return items to process (some may be deselected)"""
|
||||||
|
|
|
@ -213,17 +213,10 @@ class TestNewSession(SessionTests):
|
||||||
assert len(colfail) == 1
|
assert len(colfail) == 1
|
||||||
assert len(colskipped) == 1
|
assert len(colskipped) == 1
|
||||||
|
|
||||||
def test_minus_x_import_error(self):
|
def test_minus_x_import_error(self, testdir):
|
||||||
py.test.skip("fails")
|
testdir.makepyfile(test_one="xxxx", test_two="yyyy")
|
||||||
o = self.tmpdir
|
sorter = testdir.inline_run("-x", testdir.tmpdir)
|
||||||
tfile = o.join('test_one.py').write(py.code.Source("""
|
finished = sorter.getnamed("collectionreport")
|
||||||
xxxx
|
|
||||||
"""))
|
|
||||||
tfile2 = o.join('test_two.py').write(py.code.Source("""
|
|
||||||
yyyyy
|
|
||||||
"""))
|
|
||||||
sorter = self.events_from_cmdline('-x')
|
|
||||||
finished = sorter.get(event.CollectionReport)
|
|
||||||
colfail = [x for x in finished if x.failed]
|
colfail = [x for x in finished if x.failed]
|
||||||
assert len(colfail) == 1
|
assert len(colfail) == 1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue