From fijal at codespeak.net Mon Nov 5 11:02:59 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 5 Nov 2007 11:02:59 +0100 (CET) Subject: [py-svn] r48308 - py/branch/reporter-merge/py/test/rsession Message-ID: <20071105100259.457DB81EC@code0.codespeak.net> Author: fijal Date: Mon Nov 5 11:02:58 2007 New Revision: 48308 Modified: py/branch/reporter-merge/py/test/rsession/rsession.py Log: How-this-could-ever-work Modified: py/branch/reporter-merge/py/test/rsession/rsession.py ============================================================================== --- py/branch/reporter-merge/py/test/rsession/rsession.py (original) +++ py/branch/reporter-merge/py/test/rsession/rsession.py Mon Nov 5 11:02:58 2007 @@ -20,7 +20,7 @@ class RSession(AbstractSession): """ Remote version of session """ - reporter = RemoteReporter + reporterclass = RemoteReporter def fixoptions(self): super(RSession, self).fixoptions() From fijal at codespeak.net Mon Nov 5 11:11:55 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 5 Nov 2007 11:11:55 +0100 (CET) Subject: [py-svn] r48309 - in py/branch/reporter-merge/py/test: . rsession rsession/testing testing Message-ID: <20071105101155.8EF6681EC@code0.codespeak.net> Author: fijal Date: Mon Nov 5 11:11:55 2007 New Revision: 48309 Modified: py/branch/reporter-merge/py/test/executor.py py/branch/reporter-merge/py/test/rsession/testing/test_rsession.py py/branch/reporter-merge/py/test/rsession/web.py py/branch/reporter-merge/py/test/testing/test_boxing.py py/branch/reporter-merge/py/test/testing/test_reporter.py Log: I hate .pyc, I hate .pyc, I hate .pyc Modified: py/branch/reporter-merge/py/test/executor.py ============================================================================== --- py/branch/reporter-merge/py/test/executor.py (original) +++ py/branch/reporter-merge/py/test/executor.py Mon Nov 5 11:11:55 2007 @@ -4,7 +4,7 @@ import py, os, sys from py.__.test.outcome import SerializableOutcome, ReprOutcome -from py.__.test.rsession.box import Box +from py.__.test.box import Box from py.__.test import repevent from py.__.test.outcome import Skipped, Failed import py.__.test.custompdb Modified: py/branch/reporter-merge/py/test/rsession/testing/test_rsession.py ============================================================================== --- py/branch/reporter-merge/py/test/rsession/testing/test_rsession.py (original) +++ py/branch/reporter-merge/py/test/rsession/testing/test_rsession.py Mon Nov 5 11:11:55 2007 @@ -129,7 +129,7 @@ hm = HostManager(self.config, hosts=hosts) nodes = hm.setup_hosts(allevents.append) - from py.__.test.rsession.testing.test_executor \ + from py.__.test.testing.test_executor \ import ItemTestPassing, ItemTestFailing, ItemTestSkipping itempass = self.getexample("pass") Modified: py/branch/reporter-merge/py/test/rsession/web.py ============================================================================== --- py/branch/reporter-merge/py/test/rsession/web.py (original) +++ py/branch/reporter-merge/py/test/rsession/web.py Mon Nov 5 11:11:55 2007 @@ -218,7 +218,10 @@ args['fullmodulename'] = str(mod_fullname) fullitemname = args['fullitemname'] if outcome.skipped: - self.skip_reasons[fullitemname] = outcome.skipped + self.skip_reasons[fullitemname] = self.repr_failure_tblong( + event.item, + outcome.skipped, + outcome.skipped.traceback) elif outcome.excinfo: self.fail_reasons[fullitemname] = self.repr_failure_tblong( event.item, outcome.excinfo, outcome.excinfo.traceback) Modified: py/branch/reporter-merge/py/test/testing/test_boxing.py ============================================================================== --- py/branch/reporter-merge/py/test/testing/test_boxing.py (original) +++ py/branch/reporter-merge/py/test/testing/test_boxing.py Mon Nov 5 11:11:55 2007 @@ -7,8 +7,8 @@ if sys.platform == 'win32': py.test.skip("rsession is unsupported on Windows.") -from py.__.test.rsession.box import Box -from py.__.test.rsession.testing import example2 +from py.__.test.box import Box +from py.__.test.testing import example2 def setup_module(mod): tmpdir = py.test.ensuretemp("boxtests") Modified: py/branch/reporter-merge/py/test/testing/test_reporter.py ============================================================================== --- py/branch/reporter-merge/py/test/testing/test_reporter.py (original) +++ py/branch/reporter-merge/py/test/testing/test_reporter.py Mon Nov 5 11:11:55 2007 @@ -23,7 +23,7 @@ from py.__.test import repevent from py.__.test.outcome import ReprOutcome, SerializableOutcome from py.__.test.rsession.hostmanage import HostInfo -from py.__.test.rsession.box import Box +from py.__.test.box import Box from py.__.test.rsession.testing.basetest import BasicRsessionTest import sys from StringIO import StringIO From fijal at codespeak.net Mon Nov 5 11:14:28 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 5 Nov 2007 11:14:28 +0100 (CET) Subject: [py-svn] r48310 - py/branch/reporter-merge/py Message-ID: <20071105101428.C60E681DC@code0.codespeak.net> Author: fijal Date: Mon Nov 5 11:14:26 2007 New Revision: 48310 Modified: py/branch/reporter-merge/py/__init__.py Log: Expose custompdb Modified: py/branch/reporter-merge/py/__init__.py ============================================================================== --- py/branch/reporter-merge/py/__init__.py (original) +++ py/branch/reporter-merge/py/__init__.py Mon Nov 5 11:14:26 2007 @@ -33,6 +33,7 @@ 'test.exit' : ('./test/session.py', 'exit'), 'test.broken' : ('./test/item.py', 'Broken'), 'test.notimplemented' : ('./test/item.py', '_NotImplemented'), + 'test.pdb' : ('./test/custompdb.py', 'set_trace'), # configuration/initialization related test api 'test.config' : ('./test/config.py', 'config_per_process'), From fijal at codespeak.net Mon Nov 5 16:47:34 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 5 Nov 2007 16:47:34 +0100 (CET) Subject: [py-svn] r48318 - in py/branch/reporter-merge/py/test: . testing Message-ID: <20071105154734.EC67D824E@code0.codespeak.net> Author: fijal Date: Mon Nov 5 16:47:34 2007 New Revision: 48318 Modified: py/branch/reporter-merge/py/test/executor.py py/branch/reporter-merge/py/test/reporter.py py/branch/reporter-merge/py/test/session.py py/branch/reporter-merge/py/test/testing/test_session.py Log: Seems that --pdb don't need to imply -s and worked out of the box. I've got no idea how to test it though :-/ Modified: py/branch/reporter-merge/py/test/executor.py ============================================================================== --- py/branch/reporter-merge/py/test/executor.py (original) +++ py/branch/reporter-merge/py/test/executor.py Mon Nov 5 16:47:34 2007 @@ -35,9 +35,11 @@ try: self.run(capture) outcome = SerializableOutcome() + outcome.stdout, outcome.stderr = self.item._getouterr() except Skipped: e = py.code.ExceptionInfo() outcome = SerializableOutcome(skipped=e) + outcome.stdout, outcome.stderr = self.item._getouterr() except (SystemExit, KeyboardInterrupt): raise except: @@ -52,6 +54,7 @@ excinfo.traceback = excinfo.traceback.cut( path=code.path, firstlineno=code.firstlineno) outcome = SerializableOutcome(excinfo=excinfo, setupfailure=False) + outcome.stdout, outcome.stderr = self.item._getouterr() if self.usepdb: if self.reporter is not None: self.reporter(repevent.ImmediateFailure(self.item, @@ -60,8 +63,7 @@ py.__.test.custompdb.post_mortem(excinfo._excinfo[2]) # XXX hmm, we probably will not like to continue from that # point - #raise SystemExit() - outcome.stdout, outcome.stderr = self.item._getouterr() + raise SystemExit() return outcome class ApigenExecutor(RunExecutor): Modified: py/branch/reporter-merge/py/test/reporter.py ============================================================================== --- py/branch/reporter-merge/py/test/reporter.py (original) +++ py/branch/reporter-merge/py/test/reporter.py Mon Nov 5 16:47:34 2007 @@ -143,6 +143,7 @@ self.timersync = item.time def report_ImmediateFailure(self, event): + self.out.line() self.repr_failure(event.item, event.outcome) def report_TestFinished(self, item): Modified: py/branch/reporter-merge/py/test/session.py ============================================================================== --- py/branch/reporter-merge/py/test/session.py (original) +++ py/branch/reporter-merge/py/test/session.py Mon Nov 5 16:47:34 2007 @@ -61,10 +61,6 @@ option.startserver = True if self.config.getvalue("dist_boxed") and option.dist: option.boxed = True - # implied options - if option.usepdb: - if not option.nocapture: - option.nocapture = True # conflicting options if option.looponfailing and option.usepdb: raise ValueError, "--looponfailing together with --pdb not supported." Modified: py/branch/reporter-merge/py/test/testing/test_session.py ============================================================================== --- py/branch/reporter-merge/py/test/testing/test_session.py (original) +++ py/branch/reporter-merge/py/test/testing/test_session.py Mon Nov 5 16:47:34 2007 @@ -6,7 +6,6 @@ FailedTryiter implied_options = { - '--pdb': 'usepdb and nocapture', '-v': 'verbose', '-l': 'showlocals', #'--runbrowser': 'startserver and runbrowser', XXX starts browser From py-svn at codespeak.net Tue Nov 6 14:39:52 2007 From: py-svn at codespeak.net (VIAGRA ® Official Site) Date: Tue, 6 Nov 2007 14:39:52 +0100 (CET) Subject: [py-svn] November 73% OFF Message-ID: <20071106153945.3191.qmail@ppp-124.120.166.237.revip2.asianet.co.th> An HTML attachment was scrubbed... URL: From cfbolz at codespeak.net Tue Nov 6 23:11:31 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 6 Nov 2007 23:11:31 +0100 (CET) Subject: [py-svn] r48347 - in py/trunk/py/path/svn: . testing Message-ID: <20071106221131.DCC038277@code0.codespeak.net> Author: cfbolz Date: Tue Nov 6 23:11:30 2007 New Revision: 48347 Modified: py/trunk/py/path/svn/testing/test_wccommand.py py/trunk/py/path/svn/wccommand.py Log: make status on working copy objects deal with replaced files Modified: py/trunk/py/path/svn/testing/test_wccommand.py ============================================================================== --- py/trunk/py/path/svn/testing/test_wccommand.py (original) +++ py/trunk/py/path/svn/testing/test_wccommand.py Tue Nov 6 23:11:30 2007 @@ -33,6 +33,7 @@ assert not s.prop_modified assert not s.added assert not s.deleted + assert not s.replaced dpath = self.root.join('sampledir') assert_nochange(self.root.join('sampledir')) @@ -47,6 +48,7 @@ assert s.added assert not s.modified assert not s.prop_modified + assert not s.replaced finally: nf.revert() @@ -58,6 +60,7 @@ assert not s.added assert s.modified assert not s.prop_modified + assert not s.replaced finally: nf.revert() @@ -113,6 +116,17 @@ finally: r.update() + def test_status_replaced(self): + p = self.root.join("samplefile") + p.remove() + p.ensure(dir=0) + p.add() + try: + s = self.root.status() + assert p.basename in [item.basename for item in s.replaced] + finally: + self.root.revert(rec=1) + def test_diff(self): p = self.root / 'anotherfile' out = p.diff(rev=2) Modified: py/trunk/py/path/svn/wccommand.py ============================================================================== --- py/trunk/py/path/svn/wccommand.py (original) +++ py/trunk/py/path/svn/wccommand.py Tue Nov 6 23:11:30 2007 @@ -306,6 +306,8 @@ rootstatus.kindmismatch.append(wcpath) elif c0 == '!': rootstatus.incomplete.append(wcpath) + elif c0 == 'R': + rootstatus.replaced.append(wcpath) elif not c0.strip(): rootstatus.unchanged.append(wcpath) else: @@ -566,7 +568,7 @@ class WCStatus: attrnames = ('modified','added', 'conflict', 'unchanged', 'external', 'deleted', 'prop_modified', 'unknown', 'update_available', - 'incomplete', 'kindmismatch', 'ignored', 'locked' + 'incomplete', 'kindmismatch', 'ignored', 'locked', 'replaced' ) def __init__(self, wcpath, rev=None, modrev=None, author=None): From fijal at codespeak.net Sun Nov 11 14:39:57 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 11 Nov 2007 14:39:57 +0100 (CET) Subject: [py-svn] r48565 - py/branch/reporter-merge/py/test/rsession Message-ID: <20071111133957.754EA824B@code0.codespeak.net> Author: fijal Date: Sun Nov 11 14:39:57 2007 New Revision: 48565 Modified: py/branch/reporter-merge/py/test/rsession/web.py Log: Hopeless attempt to make web reporter work. Modified: py/branch/reporter-merge/py/test/rsession/web.py ============================================================================== --- py/branch/reporter-merge/py/test/rsession/web.py (original) +++ py/branch/reporter-merge/py/test/rsession/web.py Sun Nov 11 14:39:57 2007 @@ -431,6 +431,9 @@ def __init__(self, config, hosts): start_server_from_config(config) + def was_failure(self): + return sum(exported_methods.fail_reasons.values()) > 0 + # rebind report = exported_methods.report __call__ = report From fijal at codespeak.net Thu Nov 15 01:31:43 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 15 Nov 2007 01:31:43 +0100 (CET) Subject: [py-svn] r48698 - py/branch/reporter-merge/py/test Message-ID: <20071115003143.BFD4781BC@code0.codespeak.net> Author: fijal Date: Thu Nov 15 01:31:42 2007 New Revision: 48698 Modified: py/branch/reporter-merge/py/test/session.py Log: Uh. 2.4 compatibility Modified: py/branch/reporter-merge/py/test/session.py ============================================================================== --- py/branch/reporter-merge/py/test/session.py (original) +++ py/branch/reporter-merge/py/test/session.py Thu Nov 15 01:31:42 2007 @@ -16,6 +16,11 @@ and tells reporter about that """ +try: + GeneratorExit +except NameError: + GeneratorExit = StopIteration # I think + def itemgen(session, colitems, reporter, keyword=None): stopitems = py.test.collect.Item # XXX should be generator here as well for next in colitems: From py-svn at codespeak.net Thu Nov 15 07:57:01 2007 From: py-svn at codespeak.net (VIAGRA ® Official Site) Date: Thu, 15 Nov 2007 07:57:01 +0100 (CET) Subject: [py-svn] November 73% OFF Message-ID: <20071114025705.2964.qmail@ppp35-141-id.indosat.net.id> An HTML attachment was scrubbed... URL: