[^<]+

\xa0\xa0\xa0\xa0\xa0\xa0' u'func

\xa0\xa0' + u'bar

\xa0\xa0\xa0\xa0\xa0\xa0' From guido at codespeak.net Fri Jan 19 12:01:16 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Fri, 19 Jan 2007 12:01:16 +0100 (CET) Subject: [py-svn] r36982 - in py/dist/py/apigen: . testing Message-ID: <20070119110116.BC51D10072@code0.codespeak.net> Author: guido Date: Fri Jan 19 12:01:14 2007 New Revision: 36982 Modified: py/dist/py/apigen/apigen.py py/dist/py/apigen/htmlgen.py py/dist/py/apigen/testing/test_apigen_example.py py/dist/py/apigen/testing/test_apigen_functional.py Log: Passing namespace_tree around to the prepare_* methods to allow building of consistent navigation (showing the same siblings every level). Modified: py/dist/py/apigen/apigen.py ============================================================================== --- py/dist/py/apigen/apigen.py (original) +++ py/dist/py/apigen/apigen.py Fri Jan 19 12:01:14 2007 @@ -35,13 +35,17 @@ targetdir.ensure(dir=True) all_names = dsa._get_names(filter=lambda x, y: True) - ns_data = htmlgen.prepare_namespace_api_pages(l, dsa, targetdir, all_names) + namespace_tree = htmlgen.create_namespace_tree(dsa, all_names) + ns_data = htmlgen.prepare_namespace_api_pages(l, dsa, targetdir, + namespace_tree) class_names = dsa.get_class_names() class_data, method_data = htmlgen.prepare_class_api_pages(l, dsa, targetdir, + namespace_tree, class_names) function_names = dsa.get_function_names() func_data = htmlgen.prepare_function_api_pages(l, dsa, targetdir, + namespace_tree, function_names) source_data = htmlgen.prepare_source_pages(l, pkgdir, targetdir) Modified: py/dist/py/apigen/htmlgen.py ============================================================================== --- py/dist/py/apigen/htmlgen.py (original) +++ py/dist/py/apigen/htmlgen.py Fri Jan 19 12:01:14 2007 @@ -263,14 +263,16 @@ content = page.unicode() #linker.call_withbase(reltargetpath, page.unicode) outputpath.write(content.encode("utf8")) -def prepare_class_api_pages(linker, dsa, base, classes_dotted_names): +def prepare_class_api_pages(linker, dsa, base, namespace_tree, + classes_dotted_names): passed = [] methodsdata = [] for dotted_name in classes_dotted_names: parent_dotted_name = dotted_name.rsplit('.', 1)[0] - sibling_dotted_names = [dn for dn in classes_dotted_names if - dn.startswith(parent_dotted_name) and - dn.count('.') == dotted_name.count('.')] + try: + sibling_dotted_names = namespace_tree[parent_dotted_name] + except KeyError: + sibling_dotted_names = [] # no siblings (built-in module or sth) tag = build_class_view(base, linker, dsa, dotted_name) nav = build_api_navigation(linker, dsa, parent_dotted_name, sibling_dotted_names, dotted_name) @@ -281,6 +283,7 @@ method_name in dsa.get_class_methods(dotted_name)] methodsdata += prepare_method_api_pages(linker, dsa, base, + namespace_tree, method_dotted_names) return passed, methodsdata @@ -293,15 +296,18 @@ targetpath = outputbase.ensure(reltargetpath) targetpath.write(content.encode("utf8")) -def prepare_method_api_pages(linker, dsa, base, method_dotted_names): +def prepare_method_api_pages(linker, dsa, base, namespace_tree, + method_dotted_names): # XXX note that even though these pages are still built, there's no nav # pointing to them anymore... passed = [] for dotted_name in method_dotted_names: parent_dotted_name = dotted_name.rsplit('.', 1)[0] + module_dotted_name = dotted_name.rsplit('.', 2)[0] + sibling_dotted_names = namespace_tree[module_dotted_name] tag = build_full_method_view(base, linker, dsa, dotted_name) nav = build_api_navigation(linker, dsa, parent_dotted_name, - method_dotted_names, dotted_name) + sibling_dotted_names, dotted_name) reltargetpath = "api/%s.html" % (dotted_name,) linker.set_link(dotted_name, reltargetpath) passed.append((dotted_name, tag, nav, reltargetpath)) @@ -316,14 +322,13 @@ targetpath.ensure() targetpath.write(content.encode("utf8")) -def prepare_function_api_pages(linker, dsa, base, method_dotted_names): +def prepare_function_api_pages(linker, dsa, base, namespace_tree, + method_dotted_names): passed = [] for dotted_name in method_dotted_names: # XXX should we create a build_full_function_view instead? parent_dotted_name = dotted_name.rsplit('.', 1)[0] - sibling_dotted_names = [dn for dn in method_dotted_names if - dn.startswith(parent_dotted_name) and - dn.count('.') == dotted_name.count('.')] + sibling_dotted_names = namespace_tree[parent_dotted_name] tag = build_full_method_view(base, linker, dsa, dotted_name) nav = build_api_navigation(linker, dsa, parent_dotted_name, sibling_dotted_names, dotted_name) @@ -355,11 +360,10 @@ ret[ns].append(itempath) return ret -def prepare_namespace_api_pages(linker, dsa, base, all_dotted_names): +def prepare_namespace_api_pages(linker, dsa, base, namespace_tree): passed = [] module_name = dsa.get_module_name().split('/')[-1] - namespace_tree = create_namespace_tree(dsa, all_dotted_names) names = namespace_tree.keys() names.sort() for dotted_name in names: Modified: py/dist/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_example.py (original) +++ py/dist/py/apigen/testing/test_apigen_example.py Fri Jan 19 12:01:14 2007 @@ -83,11 +83,15 @@ def test_build_function_api_pages(self): base = py.test.ensuretemp('build_function_api_pages') prepare_source_pages(self.linker, self.fs_root, base) + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.sub', 'pkg.sub.func', + 'pkg.SomeClass', + 'pkg.SomeSubClass']) prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', 'pkg.SomeSubClass']) + namespace_tree) data = prepare_function_api_pages(self.linker, self.dsa, - base, ['pkg.sub.func']) + base, namespace_tree, + ['pkg.sub.func']) build_function_api_pages(self.linker, data, self.project, base) funcfile = base.join('api/pkg.sub.func.html') assert funcfile.check() @@ -104,13 +108,17 @@ def test_build_class_api_pages(self): base = py.test.ensuretemp('build_class_api_pages') + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.SomeClass', + 'pkg.SomeSubClass', + 'pkg.sub.func']) data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, - base, ['pkg.SomeClass']) + base, namespace_tree, + ['pkg.SomeClass', + 'pkg.SomeSubClass']) prepare_source_pages(self.linker, self.fs_root, base) prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree) build_class_api_pages(self.linker, data, self.project, base) build_method_api_pages(self.linker, methodsdata, self.project, base) clsfile = base.join('api/pkg.SomeClass.html') @@ -120,13 +128,16 @@ def test_build_class_api_pages_nav_links(self): base = py.test.ensuretemp('build_class_api_pages_nav_links') + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.SomeClass', + 'pkg.SomeSubClass', + 'pkg.sub.func']) data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, - base, ['pkg.SomeSubClass', 'pkg.SomeClass']) + base, namespace_tree, + ['pkg.SomeSubClass', 'pkg.SomeClass']) prepare_source_pages(self.linker, self.fs_root, base) prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree) build_class_api_pages(self.linker, data, self.project, base) build_method_api_pages(self.linker, methodsdata, self.project, base) clsfile = base.join('api/pkg.SomeClass.html') @@ -137,20 +148,22 @@ assert 'href="pkg.html"' in html assert 'href="pkg.SomeClass.html"' in html assert 'href="pkg.SomeSubClass.html"' in html + assert 'href="pkg.sub.html"' in html assert not 'href="pkg.sub.func.html"' in html - # not entirely sure about this one... - assert not 'href="pkg.sub.html"' in html _checkhtml(html) def test_build_class_api_pages_base_link(self): base = py.test.ensuretemp('build_class_api_pages_base_link') + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.SomeClass', + 'pkg.SomeSubClass', + 'pkg.sub.func']) data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, - base, ['pkg.SomeSubClass', 'pkg.SomeClass']) + base, namespace_tree, + ['pkg.SomeSubClass', 'pkg.SomeClass']) prepare_source_pages(self.linker, self.fs_root, base) prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree) build_class_api_pages(self.linker, data, self.project, base) build_method_api_pages(self.linker, methodsdata, self.project, base) clsfile = base.join('api/pkg.SomeSubClass.html') @@ -168,13 +181,16 @@ def test_api_source_links(self): base = py.test.ensuretemp('api_source_links') + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.SomeClass', + 'pkg.SomeSubClass', + 'pkg.sub.func']) data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, - base, ['pkg.SomeSubClass', 'pkg.SomeClass']) + base, namespace_tree, + ['pkg.SomeSubClass', 'pkg.SomeClass']) sourcedata = prepare_source_pages(self.linker, self.fs_root, base) prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree) build_class_api_pages(self.linker, data, self.project, base) build_method_api_pages(self.linker, methodsdata, self.project, base) build_source_pages(self.linker, sourcedata, self.project, base) @@ -194,14 +210,17 @@ def test_build_namespace_api_pages_index(self): base = py.test.ensuretemp('build_namespace_api_pages') + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.sub', 'pkg.sub.func', + 'pkg.SomeClass', + 'pkg.SomeSubClass']) data = prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree) prepare_class_api_pages(self.linker, self.dsa, base, + namespace_tree, ['pkg.SomeClass', 'pkg.SomeSubClass']) prepare_function_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func']) + namespace_tree, ['pkg.sub.func']) prepare_source_pages(self.linker, self.fs_root, base) build_namespace_api_pages(self.linker, data, self.project, base) pkgfile = base.join('api/pkg.html') @@ -211,14 +230,17 @@ def test_build_namespace_api_pages_subnamespace(self): base = py.test.ensuretemp('build_namespace_api_pages') + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.sub', 'pkg.sub.func', + 'pkg.SomeClass', + 'pkg.SomeSubClass']) data = prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree) prepare_class_api_pages(self.linker, self.dsa, base, + namespace_tree, ['pkg.SomeClass', 'pkg.SomeSubClass']) prepare_function_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func']) + namespace_tree, ['pkg.sub.func']) prepare_source_pages(self.linker, self.fs_root, base) build_namespace_api_pages(self.linker, data, self.project, base) subfile = base.join('api/pkg.sub.html') @@ -240,11 +262,15 @@ def test_build_function_api_pages_nav(self): base = py.test.ensuretemp('build_function_api_pages_nav') prepare_source_pages(self.linker, self.fs_root, base) + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.sub', 'pkg.sub.func', + 'pkg.SomeClass', + 'pkg.SomeSubClass']) prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', 'pkg.SomeSubClass']) + namespace_tree) data = prepare_function_api_pages(self.linker, self.dsa, - base, ['pkg.sub.func']) + base, namespace_tree, + ['pkg.sub.func']) build_function_api_pages(self.linker, data, self.project, base) funcfile = base.join('api/pkg.sub.func.html') html = funcfile.read() @@ -256,11 +282,14 @@ def test_build_function_navigation(self): base = py.test.ensuretemp('build_function_navigation') prepare_source_pages(self.linker, self.fs_root, base) + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.sub', 'pkg.sub.func', + 'pkg.SomeClass', + 'pkg.SomeSubClass']) prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', 'pkg.SomeSubClass']) + namespace_tree) prepare_function_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func']) + namespace_tree, ['pkg.sub.func']) nav = build_api_navigation(self.linker, self.dsa, 'pkg.sub', ['pkg.sub.func'], 'pkg.sub.func') html = nav.unicode(indent=0) @@ -276,13 +305,16 @@ def test_build_root_namespace_view(self): base = py.test.ensuretemp('build_root_namespace_view') prepare_source_pages(self.linker, self.fs_root, base) + namespace_tree = create_namespace_tree(self.dsa, + ['pkg.sub', 'pkg.sub.func', + 'pkg.SomeClass', + 'pkg.SomeSubClass']) data = prepare_namespace_api_pages(self.linker, self.dsa, base, - ['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree) prepare_function_api_pages(self.linker, self.dsa, base, - ['pkg.sub.func']) + namespace_tree, ['pkg.sub.func']) prepare_class_api_pages(self.linker, self.dsa, base, + namespace_tree, ['pkg.SomeClass', 'pkg.SomeSubClass']) build_namespace_api_pages(self.linker, data, self.project, base) rootfile = base.join('api/index.html') Modified: py/dist/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_functional.py (original) +++ py/dist/py/apigen/testing/test_apigen_functional.py Fri Jan 19 12:01:14 2007 @@ -15,32 +15,35 @@ output = py.process.cmdexec( 'APIGEN_TARGET=%s py.test --session=L --apigen=%s/apigen.py %s' % ( tempdir, parentdir, pkgdir)) - assert output.lower().find('traceback') == -1 + assert output.lower().find('traceback') == -1 # just some quick content checks apidir = tempdir.join('api') assert apidir.check(dir=True) someclass_api = apidir.join('pkg.SomeClass.html') assert someclass_api.check(file=True) - assert someclass_api.read().find( - 'SomeClass') > -1 - someclass_init_api = apidir.join('pkg.SomeClass.__init__.html') - assert someclass_init_api.check(file=True) - assert someclass_init_api.read().find( - '__init__') > -1 + html = someclass_api.read() + assert 'SomeClass' in html + # XXX not linking to method files anymore + #someclass_init_api = apidir.join('pkg.SomeClass.__init__.html') + #assert someclass_init_api.check(file=True) + #assert someclass_init_api.read().find( + # '__init__') > -1 namespace_api = apidir.join('pkg.html') assert namespace_api.check(file=True) - assert namespace_api.read().find( - 'SomeClass') > -1 + html = namespace_api.read() + assert 'SomeClass' in html sourcedir = tempdir.join('source') assert sourcedir.check(dir=True) someclass_source = sourcedir.join('someclass.py.html') assert someclass_source.check(file=True) - assert someclass_source.read().find( - '

sources for someclass.py

') > -1 + html = someclass_source.read() + assert '

sources for someclass.py

' in html # XXX later... #index = sourcedir.join('index.html') #assert index.check(file=True) + #html = index.read() + #assert 'pkg' in html From fijal at codespeak.net Fri Jan 19 12:19:03 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 12:19:03 +0100 (CET) Subject: [py-svn] r36985 - py/branch/config/py/test Message-ID: <20070119111903.B97FC1006E@code0.codespeak.net> Author: fijal Date: Fri Jan 19 12:19:01 2007 New Revision: 36985 Added: py/branch/config/py/test/rsession-cleanup.txt Log: Document how I see cleanup of rsession. Added: py/branch/config/py/test/rsession-cleanup.txt ============================================================================== --- (empty file) +++ py/branch/config/py/test/rsession-cleanup.txt Fri Jan 19 12:19:01 2007 @@ -0,0 +1,42 @@ +Quick overview to make myself sure what I'm talking about. + +exit cases: + +1. normal exit (tests finished) +2. -x and a failing test seen at sending side +3. C-c pressed, or SystemExit raised + +exit conditions: + +- normal cleanup (exit) +- cleanup of remote nodes (rsession only) - possibly kill child processes + and close gateway nicely +- cleanup of web server (only regarding to web interface) - probably later + +Normal exit: + +easy :), just works + +-x and a failing test: + +works, but with a hack + +C-c hard case: + +we should have different layers of C-c pressed, to make sure that we can +interrupt teardown and still exit cleanly, that's why I don't like the idea +of having finally: beacause exceptions are ignored inside finally. + +We should kill Info.pid hack, which is quite awfull usecase of global +variable. + +So: + + first strike of C-c should go to hosts_teardown and start sending nodes info + that they should kill boxes. + + second strike should exit this teardown, print some message like "abandoned" + and eventually try to kill web server. + + third strike should just exit program. + From fijal at codespeak.net Fri Jan 19 13:06:02 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 13:06:02 +0100 (CET) Subject: [py-svn] r36986 - in py/branch/config/py/test/rsession: . testing webdata Message-ID: <20070119120602.0A86A10071@code0.codespeak.net> Author: fijal Date: Fri Jan 19 13:05:58 2007 New Revision: 36986 Modified: py/branch/config/py/test/rsession/box.py py/branch/config/py/test/rsession/executor.py py/branch/config/py/test/rsession/master.py py/branch/config/py/test/rsession/slave.py py/branch/config/py/test/rsession/testing/test_master.py py/branch/config/py/test/rsession/testing/test_slave.py py/branch/config/py/test/rsession/testing/test_webjs.py py/branch/config/py/test/rsession/webdata/source.js Log: Improve the behaviour off cleanup and channel closing, at least on slave side. Some cleanups, got rid of some hacks (in favor of other hacks, but posix is a bit hackish anyway) Modified: py/branch/config/py/test/rsession/box.py ============================================================================== --- py/branch/config/py/test/rsession/box.py (original) +++ py/branch/config/py/test/rsession/box.py Fri Jan 19 13:05:58 2007 @@ -86,8 +86,8 @@ retvalf.close() os._exit(0) - def parent(self, pid): - pid, exitstat = os.waitpid(pid, 0) + def parent(self, pid, waiter=os.waitpid): + pid, exitstat = waiter(pid, 0) self.signal = exitstat & 0x7f self.exitstat = exitstat & 0xff00 Modified: py/branch/config/py/test/rsession/executor.py ============================================================================== --- py/branch/config/py/test/rsession/executor.py (original) +++ py/branch/config/py/test/rsession/executor.py Fri Jan 19 13:05:58 2007 @@ -84,8 +84,8 @@ b = Box(fun, config=self.config) parent, pid = b.run(continuation=True) - def cont(): - parent(pid) + def cont(waiter=os.waitpid): + parent(pid, waiter=waiter) if b.retval is not None: passed, setupfailure, excinfo, skipped,\ critical, _, _, _ = b.retval Modified: py/branch/config/py/test/rsession/master.py ============================================================================== --- py/branch/config/py/test/rsession/master.py (original) +++ py/branch/config/py/test/rsession/master.py Fri Jan 19 13:05:58 2007 @@ -35,7 +35,7 @@ self.reporter(report.SendItem(self.channel, item)) def itemgen(colitems, reporter, keyword, reporterror): - for x in colitems: + for x in colitems: for y in x.tryiter(reporterror = lambda x: reporterror(reporter, x), keyword = keyword): yield y Modified: py/branch/config/py/test/rsession/slave.py ============================================================================== --- py/branch/config/py/test/rsession/slave.py (original) +++ py/branch/config/py/test/rsession/slave.py Fri Jan 19 13:05:58 2007 @@ -5,16 +5,51 @@ import py from py.__.test.rsession.executor import RunExecutor, BoxExecutor, AsyncExecutor from py.__.test.rsession.outcome import Outcome +import thread +import os -class Info: - # XXX: Another nasty hack to get rid off - pid = None +class PidInfo(object): + """ Pure container class to store information of actually running + pid + """ + def __init__(self): + self.pid = 0 + self.lock = thread.allocate_lock() + + def set_pid(self, pid): + self.lock.acquire() + try: + self.pid = pid + finally: + self.lock.release() + + def kill(self): + self.lock.acquire() + try: + if self.pid: + os.kill(self.pid, 15) + self.pid = 0 + finally: + self.lock.release() + + def waitandclear(self, pid, num): + """ This is an obscure hack to keep locking properly, adhere to posix semantics + and try to clean it as much as possible, not clean at all + """ + self.lock.acquire() + try: + retval = os.waitpid(self.pid, 0) + self.pid = 0 + return retval + finally: + self.lock.release() class SlaveNode(object): - def __init__(self, rootcollector, config, executor=AsyncExecutor): + def __init__(self, rootcollector, config, pidinfo, executor=AsyncExecutor): self.rootcollector = rootcollector self.config = config self.executor = executor + self.pidinfo = pidinfo def execute(self, itemspec): item = self.rootcollector.getitembynames(itemspec) @@ -24,11 +59,11 @@ ex = self.executor(item, config=self.config) if self.executor is AsyncExecutor: cont, pid = ex.execute() + self.pidinfo.set_pid(pid) else: # for tests only return ex.execute() - Info.pid = pid - return cont() + return cont(self.pidinfo.waitandclear) def run(self, itemspec): #outcome = self.execute(itemspec) @@ -39,7 +74,7 @@ else: return outcome.make_repr(self.config.option.tbstyle) -def slave_main(receive, send, path, config, info = None): +def slave_main(receive, send, path, config, pidinfo): import os assert os.path.exists(path) path = os.path.abspath(path) @@ -49,7 +84,7 @@ if node is not None: return node col = py.test.collect.Directory(str(py.path.local(path).join(item[0]))) - node = nodes[item[0]] = SlaveNode(col, config) + node = nodes[item[0]] = SlaveNode(col, config, pidinfo) return node while 1: nextitem = receive() @@ -72,15 +107,14 @@ while nextitem is not None: nextitem = receive() - + def setup(): - def callback_gen(queue): - from py.__.test.rsession.slave import Info + def callback_gen(channel, queue, info): def callback(item): if item == 42: # magic call-cleanup # XXX should kill a pid here - if Info.pid: - os.kill(Info.pid, 15) + info.kill() + channel.close() sys.exit(0) queue.put(item) return callback @@ -100,15 +134,15 @@ config.conftest.setinitial([basedir]) #config.conftest.lget('adddefaultoptions')() config.merge_repr(config_repr) - from py.__.test.rsession.slave import Info - Info.pid = 0 if not config.option.nomagic: py.magic.invoke(assertion=1) mod = __import__(pkgname) assert py.path.local(mod.__file__).dirpath() == py.path.local(pkgdir) - from py.__.test.rsession.slave import slave_main + from py.__.test.rsession.slave import slave_main, PidInfo queue = py.std.Queue.Queue() - channel.setcallback(callback_gen(queue)) - slave_main(queue.get, channel.send, basedir, config) + pidinfo = PidInfo() + channel.setcallback(callback_gen(channel, queue, pidinfo)) + slave_main(queue.get, channel.send, basedir, config, pidinfo) if not config.option.nomagic: py.magic.revoke(assertion=1) + channel.close() Modified: py/branch/config/py/test/rsession/testing/test_master.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_master.py (original) +++ py/branch/config/py/test/rsession/testing/test_master.py Fri Jan 19 13:05:58 2007 @@ -11,7 +11,7 @@ from py.__.test.rsession.master import dispatch_loop, setup_slave, MasterNode, randomgen from py.__.test.rsession.outcome import ReprOutcome, Outcome -from py.__.test.rsession.testing.test_slave import funcpass_spec, funcfail_spec +from py.__.test.rsession.testing.test_slave import funcpass_spec, funcfail_spec, funchang_spec from py.__.test.rsession import report from py.__.test.rsession.hostmanage import HostInfo @@ -94,7 +94,7 @@ channel.send(funcpass_spec) output = ReprOutcome(channel.receive()) assert output.passed - channel.send(None) + channel.send(42) channel.waitclose(10) gw.exit() @@ -126,6 +126,34 @@ shouldstop = lambda : False dispatch_loop(master_nodes, itemgenerator, shouldstop) +def test_slave_running_interrupted(): + #def simple_report(event): + # if not isinstance(event, report.ReceivedItemOutcome): + # return + # item = event.item + # if item.code.name == 'funcpass': + # assert event.outcome.passed + # else: + # assert not event.outcome.passed + reports = [] + + def open_gw(): + gw = py.execnet.PopenGateway() + gw.host = HostInfo("localhost") + gw.host.gw = gw + config = py.test.config._reparse([]) + channel = setup_slave(gw, pkgdir, config) + mn = MasterNode(channel, reports.append, {}) + return mn, gw, channel + + mn, gw, channel = open_gw() + rootcol = py.test.collect.Directory(pkgdir.dirpath()) + funchang_item = rootcol.getitembynames(funchang_spec) + mn.send(funchang_item) + mn.send(StopIteration) + # XXX: We have to wait here a bit to make sure that it really did happen + channel.waitclose(2) + def test_randomgen(): d = {} gen = randomgen({1:True, 2:True, 3:True}, d) Modified: py/branch/config/py/test/rsession/testing/test_slave.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_slave.py (original) +++ py/branch/config/py/test/rsession/testing/test_slave.py Fri Jan 19 13:05:58 2007 @@ -1,6 +1,6 @@ """ Testing the slave side node code (in a local way). """ -from py.__.test.rsession.slave import SlaveNode, slave_main, setup +from py.__.test.rsession.slave import SlaveNode, slave_main, setup, PidInfo from py.__.test.rsession.outcome import ReprOutcome import py, sys @@ -55,7 +55,8 @@ def gettestnode(): rootcol = py.test.collect.Directory(rootdir) config = py.test.config._reparse([rootdir]) - node = SlaveNode(rootcol, config, executor=RunExecutor) + pidinfo = PidInfo() + node = SlaveNode(rootcol, config, pidinfo, executor=RunExecutor) return node def test_slave_run_passing(): @@ -109,7 +110,8 @@ funcfail_spec ] config = py.test.config._reparse([]) - slave_main(q.pop, res.append, str(rootdir), config) + pidinfo = PidInfo() + slave_main(q.pop, res.append, str(rootdir), config, pidinfo) assert len(res) == 2 res_repr = [ReprOutcome(r) for r in res] assert not res_repr[0].passed and res_repr[1].passed @@ -134,6 +136,10 @@ raise NotImplementedError("more data") self.count += 1 return retval + + def close(self): + pass + try: exec py.code.Source(setup, "setup()").compile() in { 'channel': C()} @@ -168,6 +174,9 @@ callback(self.q.pop()) f() #thread.start_new_thread(f, ()) + + def close(self): + pass send = res.append try: Modified: py/branch/config/py/test/rsession/testing/test_webjs.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_webjs.py (original) +++ py/branch/config/py/test/rsession/testing/test_webjs.py Fri Jan 19 13:05:58 2007 @@ -7,8 +7,6 @@ from pypy.translator.js.tester import schedule_callbacks here = py.magic.autopath().dirpath() -py.test.skip("will fix later, multiple issues") - def setup_module(mod): # load HTML into window object html = here.join('../webdata/index.html').read() @@ -18,9 +16,7 @@ dom.window = dom.Window(html) dom.document = dom.window.document config = py.test.config._reparse([]) - from py.__.test.rsession.rsession import session_options - session_options.bind_config(config) - session_options.import_pypy = True + config._overwrite('_dist_import_pypy', True) from py.__.test.rsession import webjs from py.__.test.rsession.web import exported_methods mod.webjs = webjs Modified: py/branch/config/py/test/rsession/webdata/source.js ============================================================================== Binary files. No diff available. From fijal at codespeak.net Fri Jan 19 13:25:19 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 13:25:19 +0100 (CET) Subject: [py-svn] r36988 - in py/branch/config/py/test/rsession: . webdata Message-ID: <20070119122519.56BC410070@code0.codespeak.net> Author: fijal Date: Fri Jan 19 13:25:05 2007 New Revision: 36988 Modified: py/branch/config/py/test/rsession/hostmanage.py py/branch/config/py/test/rsession/report.py py/branch/config/py/test/rsession/rsession.py py/branch/config/py/test/rsession/webdata/source.js py/branch/config/py/test/rsession/webjs.py Log: Improve the C-c support, also keep web interface informed about crashes/interrupts. Modified: py/branch/config/py/test/rsession/hostmanage.py ============================================================================== --- py/branch/config/py/test/rsession/hostmanage.py (original) +++ py/branch/config/py/test/rsession/hostmanage.py Fri Jan 19 13:25:05 2007 @@ -149,8 +149,13 @@ if node.pending: clean = False waiter() - + teardown_gateways(reporter, channels) +def kill_channels(channels): + for channel in channels: + channel.send(42) + +def teardown_gateways(reporter, channels): for channel in channels: try: report.wrapcall(reporter, channel.waitclose) Modified: py/branch/config/py/test/rsession/report.py ============================================================================== --- py/branch/config/py/test/rsession/report.py (original) +++ py/branch/config/py/test/rsession/report.py Fri Jan 19 13:25:05 2007 @@ -124,3 +124,9 @@ def __init__(self, hostid, result): self.hostid = hostid self.result = result + +class InterruptedExecution(ReportEvent): + pass + +class CrashedExecution(ReportEvent): + pass Modified: py/branch/config/py/test/rsession/rsession.py ============================================================================== --- py/branch/config/py/test/rsession/rsession.py (original) +++ py/branch/config/py/test/rsession/rsession.py Fri Jan 19 13:25:05 2007 @@ -11,7 +11,8 @@ from py.__.test.rsession import report from py.__.test.rsession.master import \ setup_slave, MasterNode, dispatch_loop, itemgen, randomgen -from py.__.test.rsession.hostmanage import init_hosts, teardown_hosts, HostInfo +from py.__.test.rsession.hostmanage import init_hosts, teardown_hosts, HostInfo,\ + teardown_gateways, kill_channels from py.__.test.rsession.local import local_loop, plain_runner, apigen_runner,\ box_runner @@ -135,20 +136,35 @@ pkgdir = self.getpkgdir(args[0]) done_dict = {} - nodes = init_hosts(reporter, sshhosts, pkgdir, - rsync_roots, remotepython, config=self.config, - optimise_localhost=self.optimise_localhost, done_dict=done_dict) - reporter(report.RsyncFinished()) - - #try: - self.dispatch_tests(nodes, args, pkgdir, reporter, checkfun, done_dict) - #finally: - teardown_hosts(reporter, [node.channel for node in nodes], nodes, + try: + nodes = init_hosts(reporter, sshhosts, pkgdir, + rsync_roots, remotepython, config=self.config, + optimise_localhost=self.optimise_localhost, done_dict=done_dict) + reporter(report.RsyncFinished()) + try: + self.dispatch_tests(nodes, args, pkgdir, reporter, checkfun, done_dict) + except (KeyboardInterrupt, SystemExit): + print >>sys.stderr, "C-c pressed waiting for gateways to teardown..." + channels = [node.channel for node in nodes] + kill_channels(channels) + teardown_gateways(reporter, channels) + print >>sys.stderr, "... Done" + raise + + teardown_hosts(reporter, [node.channel for node in nodes], nodes, exitfirst=self.config.option.exitfirst) - reporter(report.Nodes(nodes)) - retval = reporter(report.TestFinished()) - self.kill_server(startserverflag) - return retval + reporter(report.Nodes(nodes)) + retval = reporter(report.TestFinished()) + self.kill_server(startserverflag) + return retval + except (KeyboardInterrupt, SystemExit): + reporter(report.InterruptedExecution()) + self.kill_server(startserverflag) + raise + except: + reporter(report.CrashedExecution()) + self.kill_server(startserverflag) + raise def read_distributed_config(self): try: Modified: py/branch/config/py/test/rsession/webdata/source.js ============================================================================== Binary files. No diff available. Modified: py/branch/config/py/test/rsession/webjs.py ============================================================================== --- py/branch/config/py/test/rsession/webjs.py (original) +++ py/branch/config/py/test/rsession/webjs.py Fri Jan 19 13:25:05 2007 @@ -62,6 +62,16 @@ info = dom.document.getElementById("info") info.style.visibility = "hidden" +def show_interrupt(): + glob.finished = True + dom.document.title = "Py.test [interrupted]" + dom.document.getElementById("Tests").childNodes[0].nodeValue = "Tests [interrupted]" + +def show_crash(): + glob.finished = True + dom.document.title = "Py.test [crashed]" + dom.document.getElementById("Tests").childNodes[0].nodeValue = "Tests [crashed]" + SCROLL_LINES = 50 def scroll_down_if_needed(mbox): @@ -175,6 +185,7 @@ add_received_item_outcome(msg, module_part) elif msg['type'] == 'TestFinished': text = "FINISHED %s run, %s failures, %s skipped" % (msg['run'], msg['fails'], msg['skips']) + glob.finished = True dom.document.title = "Py.test %s" % text dom.document.getElementById("Tests").childNodes[0].nodeValue = \ "Tests [%s]" % text @@ -202,6 +213,10 @@ module_part.appendChild(tr) elif msg['type'] == 'RsyncFinished': glob.rsync_done = True + elif msg['type'] == 'InterruptedExecution': + show_interrupt() + elif msg['type'] == 'CrashedExecution': + show_crash() if glob.data_empty: mbox = dom.document.getElementById('messagebox') scroll_down_if_needed(mbox) @@ -262,6 +277,8 @@ glob.host = "" def update_rsync(): + if glob.finished: + return elem = dom.document.getElementById("Tests") if glob.rsync_done is True: elem.childNodes[0].nodeValue = "Tests" @@ -299,6 +316,7 @@ exported_methods.show_all_statuses(id, comeback) def main(): + glob.finished = False exported_methods.show_hosts(host_init) exported_methods.show_sessid(sessid_comeback) From hpk at codespeak.net Fri Jan 19 14:27:39 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Fri, 19 Jan 2007 14:27:39 +0100 (CET) Subject: [py-svn] r36990 - py/dist/py/apigen Message-ID: <20070119132739.39CFC10072@code0.codespeak.net> Author: hpk Date: Fri Jan 19 14:27:37 2007 New Revision: 36990 Modified: py/dist/py/apigen/todo-apigen.txt Log: made two notes about conceptually improving the dependency/test situation Modified: py/dist/py/apigen/todo-apigen.txt ============================================================================== --- py/dist/py/apigen/todo-apigen.txt (original) +++ py/dist/py/apigen/todo-apigen.txt Fri Jan 19 14:27:37 2007 @@ -33,5 +33,36 @@ * look out for and streamline all apigen/source-viewer documentation into one document -* XXX list more here + +* consider automating dependencies: + + e.g. something like: queue_render(page, fspath, linker, ...) + would defer the rendering until later. + then a loop does: + + maxlength = len(queue) + while queue: + page, fspath, linker, ... = queue.get() + # fill outputpath/link here or even earlier + if all_links_resolve(page, linker): + render it and write to filesystem + maxlength = len(queue) + else: + queue.append(...) + maxlength -= 1 + if maxlength <= 0: + print "ERROR: seems i can't make progress" + print "unresolved links follow: " + ... + print "unresolved pages/fspaths:" + ... + XXX maybe: print "filling linker with dummy hrefs, and rendering anyway" + ... + raise ... + +* also we might have a support function for tests that + fills the linker with "dummy hrefs" for certain types + like source links + +* XXX list more here From fijal at codespeak.net Fri Jan 19 14:54:28 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 14:54:28 +0100 (CET) Subject: [py-svn] r36993 - in py/branch/config/py/test/rsession: . webdata Message-ID: <20070119135428.08FEF10070@code0.codespeak.net> Author: fijal Date: Fri Jan 19 14:54:25 2007 New Revision: 36993 Modified: py/branch/config/py/test/rsession/web.py py/branch/config/py/test/rsession/webdata/index.html py/branch/config/py/test/rsession/webdata/source.js py/branch/config/py/test/rsession/webjs.py Log: Add possibility to scroll or not to scroll to web frontend. This checkin makes me believe that there is lot of stuff to do in JS backend. Modified: py/branch/config/py/test/rsession/web.py ============================================================================== --- py/branch/config/py/test/rsession/web.py (original) +++ py/branch/config/py/test/rsession/web.py Fri Jan 19 14:54:25 2007 @@ -21,7 +21,7 @@ DATADIR = py.path.local(__file__).dirpath("webdata") FUNCTION_LIST = ["main", "show_skip", "show_traceback", "show_info", "hide_info", - "show_host", "hide_host", "hide_messagebox"] + "show_host", "hide_host", "hide_messagebox", "opt_scroll"] try: try: Modified: py/branch/config/py/test/rsession/webdata/index.html ============================================================================== --- py/branch/config/py/test/rsession/webdata/index.html (original) +++ py/branch/config/py/test/rsession/webdata/index.html Fri Jan 19 14:54:25 2007 @@ -97,6 +97,12 @@ End of Traceback + + Options + + + Scroll with tests arriving + Modified: py/branch/config/py/test/rsession/webdata/source.js ============================================================================== Binary files. No diff available. Modified: py/branch/config/py/test/rsession/webjs.py ============================================================================== --- py/branch/config/py/test/rsession/webjs.py (original) +++ py/branch/config/py/test/rsession/webjs.py Fri Jan 19 14:54:25 2007 @@ -36,6 +36,14 @@ glob = Globals() +class Options(object): + """ Store global options + """ + def __init__(self): + self.scroll = True + +opts = Options() + def comeback(msglist): if len(msglist) == 0: return @@ -74,9 +82,17 @@ SCROLL_LINES = 50 +def opt_scroll(): + if opts.scroll: + opts.scroll = False + else: + opts.scroll = True + def scroll_down_if_needed(mbox): - if dom.window.scrollMaxY - dom.window.scrollY < SCROLL_LINES: - mbox.parentNode.scrollIntoView() + if not opts.scroll: + return + #if dom.window.scrollMaxY - dom.window.scrollY < SCROLL_LINES: + mbox.parentNode.scrollIntoView() def hide_messagebox(): mbox = dom.document.getElementById("messagebox") @@ -311,6 +327,16 @@ for key in host_dict.keys(): glob.host_pending[key] = [] +def key_pressed(key): + if key.charCode == ord('s'): + scroll_box = dom.document.getElementById("opt_scroll") + if opts.scroll: + scroll_box.removeAttribute("checked") + opts.scroll = False + else: + scroll_box.setAttribute("checked", "true") + opts.scroll = True + def sessid_comeback(id): glob.sessid = id exported_methods.show_all_statuses(id, comeback) @@ -319,4 +345,5 @@ glob.finished = False exported_methods.show_hosts(host_init) exported_methods.show_sessid(sessid_comeback) - + dom.document.onkeypress = key_pressed + dom.document.getElementById("opt_scroll").setAttribute("checked", "True") From fijal at codespeak.net Fri Jan 19 15:08:20 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 15:08:20 +0100 (CET) Subject: [py-svn] r36994 - in py/branch/config/py/test: . terminal Message-ID: <20070119140820.D5BE61006E@code0.codespeak.net> Author: fijal Date: Fri Jan 19 15:08:16 2007 New Revision: 36994 Modified: py/branch/config/py/test/collect.py py/branch/config/py/test/config.py py/branch/config/py/test/terminal/terminal.py Log: removal of some trailing white-spaces. Modified: py/branch/config/py/test/collect.py ============================================================================== --- py/branch/config/py/test/collect.py (original) +++ py/branch/config/py/test/collect.py Fri Jan 19 15:08:16 2007 @@ -342,15 +342,15 @@ d[name] = res return d - def makeitem(self, name, obj, usefilters=True): + def makeitem(self, name, obj, usefilters=True): if (not usefilters or self.classnamefilter(name)) and \ - py.std.inspect.isclass(obj): - return self.Class(name, parent=self) + py.std.inspect.isclass(obj): + return self.Class(name, parent=self) elif (not usefilters or self.funcnamefilter(name)) and callable(obj): if obj.func_code.co_flags & 32: # generator function - return self.Generator(name, parent=self) + return self.Generator(name, parent=self) else: - return self.Function(name, parent=self) + return self.Function(name, parent=self) def _prepare(self): if not hasattr(self, '_name2items'): Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Fri Jan 19 15:08:16 2007 @@ -49,7 +49,7 @@ cmdlineoption, remaining = self._parser.parse_args(args) self.option.__dict__.update(vars(cmdlineoption)) fixoptions(self.option) # XXX fixing should be moved to sessions - if not remaining: + if not remaining: remaining.append(py.std.os.getcwd()) self.remaining = remaining Modified: py/branch/config/py/test/terminal/terminal.py ============================================================================== --- py/branch/config/py/test/terminal/terminal.py (original) +++ py/branch/config/py/test/terminal/terminal.py Fri Jan 19 15:08:16 2007 @@ -146,7 +146,7 @@ self.out.line("test target: %s" %(x.fspath,)) conftestmodules = self.config.conftest.getconftestmodules(None) - for i,x in py.builtin.enumerate(conftestmodules): + for i,x in py.builtin.enumerate(conftestmodules): self.out.line("initial conf %d: %s" %(i, x.__file__)) #for i, x in py.builtin.enumerate(py.test.config.configpaths): From fijal at codespeak.net Fri Jan 19 15:16:04 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 15:16:04 +0100 (CET) Subject: [py-svn] r36995 - py/branch/config/py/test/rsession/testing Message-ID: <20070119141604.C7F6410070@code0.codespeak.net> Author: fijal Date: Fri Jan 19 15:16:03 2007 New Revision: 36995 Modified: py/branch/config/py/test/rsession/testing/test_slave.py Log: Add a test for PidInfo. Modified: py/branch/config/py/test/rsession/testing/test_slave.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_slave.py (original) +++ py/branch/config/py/test/rsession/testing/test_slave.py Fri Jan 19 15:16:03 2007 @@ -221,3 +221,17 @@ else: py.test.fail("missing exception") + +def test_pidinfo(): + pidinfo = PidInfo() + pid = os.fork() + if pid: + pidinfo.set_pid(pid) + pidinfo.waitandclear(pid, 0) + else: + import time, sys + time.sleep(.3) + os._exit(0) + # check if this really exits + py.test.raises(OSError, "os.waitpid(pid, 0)") + From fijal at codespeak.net Fri Jan 19 15:19:58 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 15:19:58 +0100 (CET) Subject: [py-svn] r36996 - py/branch/config/py/test/rsession/testing Message-ID: <20070119141958.A725A10072@code0.codespeak.net> Author: fijal Date: Fri Jan 19 15:19:57 2007 New Revision: 36996 Modified: py/branch/config/py/test/rsession/testing/test_slave.py Log: Skip test if platform does not support os.fork Modified: py/branch/config/py/test/rsession/testing/test_slave.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_slave.py (original) +++ py/branch/config/py/test/rsession/testing/test_slave.py Fri Jan 19 15:19:57 2007 @@ -223,6 +223,8 @@ def test_pidinfo(): + if not hasattr(os, 'fork') or not hasattr(os, 'waitpid'): + py.test.skip("Platform does not support fork") pidinfo = PidInfo() pid = os.fork() if pid: From fijal at codespeak.net Fri Jan 19 16:00:22 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 16:00:22 +0100 (CET) Subject: [py-svn] r36998 - in py/branch/config/py/test/rsession: . testing Message-ID: <20070119150022.5ADA410079@code0.codespeak.net> Author: fijal Date: Fri Jan 19 16:00:20 2007 New Revision: 36998 Modified: py/branch/config/py/test/rsession/reporter.py py/branch/config/py/test/rsession/testing/test_reporter.py Log: Improve reporting a bit, make test not relying on concrete numbers. Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Fri Jan 19 16:00:20 2007 @@ -10,6 +10,9 @@ from py.__.test.terminal.out import getout from py.__.test.rsession import report from py.__.test.rsession import outcome +from py.__.misc.terminal_helper import ansi_print, terminal_width + +import sys class AbstractReporter(object): def __init__(self, config, hosts, pkgdir=py.path.local(py.__file__)): @@ -224,20 +227,22 @@ def report_ReceivedItemOutcome(self, event): host = event.host + itempath = " ".join(event.item.listnames()[1:]) if event.outcome.passed: status = "PASSED " self.passed[host] += 1 + print "%10s: %s %s" %(host.hostname[:10], status, itempath) elif event.outcome.skipped: status = "SKIPPED" self.skipped_tests_outcome.append(event) self.skipped[host] += 1 + print "%10s: %s %s" %(host.hostname[:10], status, itempath) else: - status = "FAILED " self.failed[host] += 1 self.failed_tests_outcome.append(event) - # we'll take care of them later - itempath = " ".join(event.item.listnames()[1:]) - print "%10s: %s %s" %(host.hostname[:10], status, itempath) + sys.stdout.write("%10s: " % host.hostname[:10]) + ansi_print("FAILED", esc=31, newline=False, file=sys.stdout) + print " " + itempath def report_Nodes(self, event): self.nodes = event.nodes Modified: py/branch/config/py/test/rsession/testing/test_reporter.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_reporter.py (original) +++ py/branch/config/py/test/rsession/testing/test_reporter.py Fri Jan 19 16:00:20 2007 @@ -181,8 +181,9 @@ def test_module(self): #py.test.skip("XXX rewrite test to not rely on exact formatting") - assert self._test_module().endswith("test_slave.py[9] FsF."),\ - self._test_module() + output = self._test_module() + assert output.find("test_slave") != -1 + assert output.endswith("FsF."), output def test_full_module(self): #py.test.skip("XXX rewrite test to not rely on exact formatting") From hpk at codespeak.net Fri Jan 19 16:06:13 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Fri, 19 Jan 2007 16:06:13 +0100 (CET) Subject: [py-svn] r36999 - in py/branch/config/py/test: . rsession Message-ID: <20070119150613.716A910079@code0.codespeak.net> Author: hpk Date: Fri Jan 19 16:06:11 2007 New Revision: 36999 Added: py/branch/config/py/test/rsession/cleanup-rsession.txt - copied unchanged from r36998, py/branch/config/py/test/rsession-cleanup.txt Removed: py/branch/config/py/test/rsession-cleanup.txt Log: move cleanup doc out of the way of completion (and into a more proper directory) Deleted: /py/branch/config/py/test/rsession-cleanup.txt ============================================================================== --- /py/branch/config/py/test/rsession-cleanup.txt Fri Jan 19 16:06:11 2007 +++ (empty file) @@ -1,42 +0,0 @@ -Quick overview to make myself sure what I'm talking about. - -exit cases: - -1. normal exit (tests finished) -2. -x and a failing test seen at sending side -3. C-c pressed, or SystemExit raised - -exit conditions: - -- normal cleanup (exit) -- cleanup of remote nodes (rsession only) - possibly kill child processes - and close gateway nicely -- cleanup of web server (only regarding to web interface) - probably later - -Normal exit: - -easy :), just works - --x and a failing test: - -works, but with a hack - -C-c hard case: - -we should have different layers of C-c pressed, to make sure that we can -interrupt teardown and still exit cleanly, that's why I don't like the idea -of having finally: beacause exceptions are ignored inside finally. - -We should kill Info.pid hack, which is quite awfull usecase of global -variable. - -So: - - first strike of C-c should go to hosts_teardown and start sending nodes info - that they should kill boxes. - - second strike should exit this teardown, print some message like "abandoned" - and eventually try to kill web server. - - third strike should just exit program. - From fijal at codespeak.net Fri Jan 19 16:07:11 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 16:07:11 +0100 (CET) Subject: [py-svn] r37001 - py/branch/config/py/test/rsession Message-ID: <20070119150711.7094E1007F@code0.codespeak.net> Author: fijal Date: Fri Jan 19 16:07:09 2007 New Revision: 37001 Modified: py/branch/config/py/test/rsession/reporter.py Log: Make it even bolder. Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Fri Jan 19 16:07:09 2007 @@ -241,7 +241,7 @@ self.failed[host] += 1 self.failed_tests_outcome.append(event) sys.stdout.write("%10s: " % host.hostname[:10]) - ansi_print("FAILED", esc=31, newline=False, file=sys.stdout) + ansi_print("FAILED", esc=(31,1), newline=False, file=sys.stdout) print " " + itempath def report_Nodes(self, event): From hpk at codespeak.net Fri Jan 19 16:08:32 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Fri, 19 Jan 2007 16:08:32 +0100 (CET) Subject: [py-svn] r37002 - py/branch/config/py/test Message-ID: <20070119150832.44A241007E@code0.codespeak.net> Author: hpk Date: Fri Jan 19 16:08:31 2007 New Revision: 37002 Modified: py/branch/config/py/test/cmdline.py Log: remove unsued/untested use case of main() invocation Modified: py/branch/config/py/test/cmdline.py ============================================================================== --- py/branch/config/py/test/cmdline.py (original) +++ py/branch/config/py/test/cmdline.py Fri Jan 19 16:08:31 2007 @@ -8,8 +8,6 @@ warn_about_missing_assertion() if args is None: args = py.std.sys.argv[1:] - elif isinstance(args, basestring): - args = args.split(" ") config = py.test.config config.parse(args) sessionclass = config.getsessionclass() From cfbolz at codespeak.net Fri Jan 19 16:25:00 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 16:25:00 +0100 (CET) Subject: [py-svn] r37003 - py/dist/py/code/testing Message-ID: <20070119152500.4FD6610078@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 16:24:58 2007 New Revision: 37003 Modified: py/dist/py/code/testing/test_source.py Log: a skipped test showing a fundamental problem with the heuristic in getstatementrange. Should be fixed, but probably only after the release. Modified: py/dist/py/code/testing/test_source.py ============================================================================== --- py/dist/py/code/testing/test_source.py (original) +++ py/dist/py/code/testing/test_source.py Fri Jan 19 16:24:58 2007 @@ -173,6 +173,22 @@ assert len(source) == 6 assert source.getstatementrange(2) == (1, 4) + def test_getstatementrange_bug2(self): + py.test.skip("fix me") + source = Source("""\ + assert ( + 33 + == + [ + X(3, + b=1, c=2 + ), + ] + ) + """) + assert len(source) == 9 + assert source.getstatementrange(5) == (0, 9) + def test_compile_and_getsource(self): co = self.source.compile() exec co From cfbolz at codespeak.net Fri Jan 19 16:35:58 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 16:35:58 +0100 (CET) Subject: [py-svn] r37005 - py/dist/py/code/testing Message-ID: <20070119153558.BDA6C10078@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 16:35:41 2007 New Revision: 37005 Modified: py/dist/py/code/testing/test_source.py Log: add issue number Modified: py/dist/py/code/testing/test_source.py ============================================================================== --- py/dist/py/code/testing/test_source.py (original) +++ py/dist/py/code/testing/test_source.py Fri Jan 19 16:35:41 2007 @@ -174,7 +174,7 @@ assert source.getstatementrange(2) == (1, 4) def test_getstatementrange_bug2(self): - py.test.skip("fix me") + py.test.skip("fix me (issue19)") source = Source("""\ assert ( 33 From hpk at codespeak.net Fri Jan 19 16:50:36 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Fri, 19 Jan 2007 16:50:36 +0100 (CET) Subject: [py-svn] r37009 - in py/branch/config/py/test: . testing Message-ID: <20070119155036.9144510077@code0.codespeak.net> Author: hpk Date: Fri Jan 19 16:50:32 2007 New Revision: 37009 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/defaultconftest.py py/branch/config/py/test/testing/test_config.py Log: adding a config method to determine the session name Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Fri Jan 19 16:50:32 2007 @@ -90,6 +90,19 @@ mod = __import__(importpath, None, None, ['__doc__']) return getattr(mod, sessionname) + def _getsessionname(self): + """ return session name as determined from options. """ + name = 'Session' + if self.option.dist: + name = 'RSession' + else: + optnames = 'startserver runbrowser apigen restreport'.split() + for opt in optnames: + if getattr(self.option, opt, False): + name = 'LSession' + break + return name + def _reparse(self, args): """ this is used from tests that want to re-invoke parse(). """ global config Modified: py/branch/config/py/test/defaultconftest.py ============================================================================== --- py/branch/config/py/test/defaultconftest.py (original) +++ py/branch/config/py/test/defaultconftest.py Fri Jan 19 16:50:32 2007 @@ -78,6 +78,9 @@ Option('', '--tkinter', action="store_true", dest="tkinter", default=False, help="use tkinter test session frontend."), + Option('', '--dist', + action="store_true", dest="dist", default=False, + help="use ad-hoc distributed testing (requires conftest settings)"), Option('', '--looponfailing', action="store_true", dest="looponfailing", default=False, help="loop on failing test set."), Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Fri Jan 19 16:50:32 2007 @@ -127,3 +127,39 @@ config.merge_repr(repr) assert config.option.gdest == 11 +class TestSessionAndOptions: + def setup_class(cls): + cls.tmproot = py.test.ensuretemp(cls.__name__) + + def setup_method(self, method): + self.tmpdir = self.tmproot.mkdir(method.__name__) + + def XXXtest_sessionclass_conftest_override(self): + self.tmpdir.join("conftest.py").write(py.code.Source(""" + from py.__.test.session import Session as orig + class Session(orig): + x = 42 + """)) + config = py.test.config._reparse([self.tmpdir]) + cls = config._getsessionclass() + assert cls.x == 42 + config.option.dist = True + config.option.startserver = True + cls = config._getsessionclass() + assert cls.x == 42 + + def test_sessionname_default(self): + config = py.test.config._reparse([]) + assert config._getsessionname() == 'Session' + + def test_sessionname_dist(self): + config = py.test.config._reparse(['--dist']) + assert config._getsessionname() == 'RSession' + + def test_implied_lsession(self): + optnames = 'startserver runbrowser apigen=x rest'.split() + for x in optnames: + config = py.test.config._reparse(['--%s' % x]) + assert config._getsessionname() == 'LSession' + config = py.test.config._reparse(['--dist', '--%s' % x]) + assert config._getsessionname() == 'RSession' # XXX is this right? From cfbolz at codespeak.net Fri Jan 19 17:04:27 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 17:04:27 +0100 (CET) Subject: [py-svn] r37010 - py/dist/py/rest Message-ID: <20070119160427.73B6610070@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 17:04:25 2007 New Revision: 37010 Modified: py/dist/py/rest/convert.py Log: quote args, so that spaces in the paths are no problem Modified: py/dist/py/rest/convert.py ============================================================================== --- py/dist/py/rest/convert.py (original) +++ py/dist/py/rest/convert.py Fri Jan 19 17:04:25 2007 @@ -16,9 +16,9 @@ raise SystemExit("neither ps2eps nor ps2epsi found") try: eps = ps.new(ext=".eps") - py.process.cmdexec("ps2epsi %s %s" % (ps, eps)) + py.process.cmdexec('ps2epsi "%s" "%s"' % (ps, eps)) except ExecutionFailed: - py.process.cmdexec("ps2eps -l -f %s" % ps) + py.process.cmdexec('ps2eps -l -f "%s"' % ps) def ps2pdf(ps, compat_level="1.2"): if not py.path.local.sysfind("gs"): @@ -36,12 +36,12 @@ # XXX write a pure python version if not py.path.local.sysfind("epstopdf"): raise SystemExit("ERROR: epstopdf not found") - py.process.cmdexec("epstopdf %s" % eps) + py.process.cmdexec('epstopdf "%s"' % eps) def dvi2eps(dvi, dest=None): if dest is None: dest = eps.new(ext=".eps") - command = 'dvips -q -E -n 1 -D 600 -p 1 -o %s %s' % (dest, dvi) + command = 'dvips -q -E -n 1 -D 600 -p 1 -o "%s" "%s"' % (dest, dvi) if not py.path.local.sysfind("dvips"): raise SystemExit("ERROR: dvips not found") py.process.cmdexec(command) @@ -52,7 +52,7 @@ result = fn.new(ext=new_extension) print result arg = "-T%s" % (format_to_dotargument[new_extension], ) - py.std.os.system("dot %s %s > %s" % (arg, fn, result)) + py.std.os.system('dot "%s" "%s" > "%s"' % (arg, fn, result)) if new_extension == "eps": ps = result.new(ext="ps") result.move(ps) @@ -115,7 +115,7 @@ def gen_dvi(self): origdir = py.path.local() self.temp.chdir() - py.process.cmdexec('latex %s' % (self.latex)) + py.process.cmdexec('latex "%s"' % (self.latex)) origdir.chdir() def gen_png(self): @@ -148,7 +148,9 @@ sx = int((x2 - x1) * self.scale * self.upscale) sy = int((y2 - y1) * self.scale * self.upscale) res = 72 * self.scale * self.upscale - command = 'gs -q -g%dx%d -r%dx%d -sDEVICE=%s -sOutputFile=%s -dNOPAUSE -dBATCH %s' % (sx, sy, res, res, self.output_format, self.png, ps) + command = ('gs -q -g%dx%d -r%dx%d -sDEVICE=%s -sOutputFile="%s" ' + '-dNOPAUSE -dBATCH "%s"') % ( + sx, sy, res, res, self.output_format, self.png, ps) py.process.cmdexec(command) def scale_image(self): From cfbolz at codespeak.net Fri Jan 19 17:06:31 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 17:06:31 +0100 (CET) Subject: [py-svn] r37011 - py/dist/py/misc/testing Message-ID: <20070119160631.D977E10070@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 17:06:28 2007 New Revision: 37011 Modified: py/dist/py/misc/testing/test_svnlook.py Log: add quoting Modified: py/dist/py/misc/testing/test_svnlook.py ============================================================================== --- py/dist/py/misc/testing/test_svnlook.py (original) +++ py/dist/py/misc/testing/test_svnlook.py Fri Jan 19 17:06:28 2007 @@ -10,8 +10,8 @@ def test_svnlook(): tempdir = py.test.ensuretemp("svnlook") repo = tempdir.join("repo") - py.process.cmdexec("svnadmin create --fs-type fsfs %s" % repo) - py.process.cmdexec("svnadmin load %s < \"%s\"" %(repo, + py.process.cmdexec('svnadmin create --fs-type fsfs "%s"' % repo) + py.process.cmdexec('svnadmin load "%s" < "%s"' %(repo, data.join("svnlookrepo.dump"))) author = svnlook.author(repo, 1) From cfbolz at codespeak.net Fri Jan 19 17:10:57 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 17:10:57 +0100 (CET) Subject: [py-svn] r37012 - in py/dist/py: apigen/testing rest Message-ID: <20070119161057.C18A610077@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 17:10:55 2007 New Revision: 37012 Modified: py/dist/py/apigen/testing/test_apigen_functional.py py/dist/py/rest/latex.py Log: more quoting Modified: py/dist/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_functional.py (original) +++ py/dist/py/apigen/testing/test_apigen_functional.py Fri Jan 19 17:10:55 2007 @@ -13,7 +13,7 @@ parentdir = py.magic.autopath().dirpath().dirpath() pkgdir = fs_root.join('pkg') output = py.process.cmdexec( - 'APIGEN_TARGET=%s py.test --session=L --apigen=%s/apigen.py %s' % ( + 'APIGEN_TARGET="%s" py.test --session=L --apigen="%s/apigen.py" "%s"' % ( tempdir, parentdir, pkgdir)) assert output.lower().find('traceback') == -1 Modified: py/dist/py/rest/latex.py ============================================================================== --- py/dist/py/rest/latex.py (original) +++ py/dist/py/rest/latex.py Fri Jan 19 17:10:55 2007 @@ -131,7 +131,7 @@ i = 0 while i < 10: # there should never be as many as five reruns, but to be sure try: - latexoutput = py.process.cmdexec("pdflatex %s" % (tex, )) + latexoutput = py.process.cmdexec('pdflatex "%s"' % (tex, )) except ExecutionFailed, e: print "ERROR: pdflatex execution failed" print "pdflatex stdout:" From hpk at codespeak.net Fri Jan 19 17:14:16 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Fri, 19 Jan 2007 17:14:16 +0100 (CET) Subject: [py-svn] r37013 - in py/branch/config/py/test: . testing tkinter Message-ID: <20070119161416.D425710078@code0.codespeak.net> Author: hpk Date: Fri Jan 19 17:14:11 2007 New Revision: 37013 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/defaultconftest.py py/branch/config/py/test/testing/test_config.py py/branch/config/py/test/tkinter/reportsession.py Log: somewhat simpler lookup mechanism for sessions Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Fri Jan 19 17:14:11 2007 @@ -81,20 +81,26 @@ and looked up in initial config modules. """ sessionname = self.option.session + 'Session' - try: - return self.conftest.lget(sessionname) - except KeyError: - pass sessionimportpaths = self.conftest.lget('sessionimportpaths') importpath = sessionimportpaths[sessionname] mod = __import__(importpath, None, None, ['__doc__']) return getattr(mod, sessionname) + def _lookupsession(self, name): + """ return session class for the given name. """ + res = self.conftest.rget(name) + if isinstance(res, str): + mod = __import__(res, None, None, '__doc__') + res = getattr(mod, name) + return res + def _getsessionname(self): """ return session name as determined from options. """ - name = 'Session' + name = 'TerminalSession' if self.option.dist: name = 'RSession' + elif self.option.tkinter: + name = 'TkinterSession' else: optnames = 'startserver runbrowser apigen restreport'.split() for opt in optnames: Modified: py/branch/config/py/test/defaultconftest.py ============================================================================== --- py/branch/config/py/test/defaultconftest.py (original) +++ py/branch/config/py/test/defaultconftest.py Fri Jan 19 17:14:11 2007 @@ -19,6 +19,11 @@ 'TkinterSession': 'py.__.test.tkinter.reportsession', } +TkinterSession = 'py.__.test.tkinter.reportsession' +TerminalSession = 'py.__.test.terminal.terminal' +RSession = 'py.__.test.rsession.rsession' +LSession = 'py.__.test.rsession.rsession' + #dist_hosts: needs to be provided by user #dist_rsync_roots: might be provided by user, if not present or None, # whole pkgdir will be rsynced Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Fri Jan 19 17:14:11 2007 @@ -149,17 +149,33 @@ assert cls.x == 42 def test_sessionname_default(self): - config = py.test.config._reparse([]) - assert config._getsessionname() == 'Session' + config = py.test.config._reparse([self.tmpdir]) + assert config._getsessionname() == 'TerminalSession' def test_sessionname_dist(self): - config = py.test.config._reparse(['--dist']) + config = py.test.config._reparse([self.tmpdir, '--dist']) assert config._getsessionname() == 'RSession' def test_implied_lsession(self): optnames = 'startserver runbrowser apigen=x rest'.split() for x in optnames: - config = py.test.config._reparse(['--%s' % x]) + config = py.test.config._reparse([self.tmpdir, '--%s' % x]) assert config._getsessionname() == 'LSession' - config = py.test.config._reparse(['--dist', '--%s' % x]) + config = py.test.config._reparse([self.tmpdir, '--dist', '--%s' % x]) assert config._getsessionname() == 'RSession' # XXX is this right? + + def test_tkintersession(self): + config = py.test.config._reparse([self.tmpdir, '--tkinter']) + assert config._getsessionname() == 'TkinterSession' + + def test_sessionname_lookup(self): + config = py.test.config._reparse([self.tmpdir]) + for name in 'TerminalSession LSession RSession TkinterSession'.split(): + cls = config._lookupsession(name) + assert cls.__name__ == name + + def XXXtest_sessionname_lookup_custom(self): + config = py.test.config._reparse([]) + for name in 'TerminalSession LSession RSession TkinterSession'.split(): + cls = config._lookupsession(name) + assert py.std.inspect.isclass(cls) Modified: py/branch/config/py/test/tkinter/reportsession.py ============================================================================== --- py/branch/config/py/test/tkinter/reportsession.py (original) +++ py/branch/config/py/test/tkinter/reportsession.py Fri Jan 19 17:14:11 2007 @@ -3,7 +3,7 @@ from util import TestReport from py.__.test.session import Session -class ReportSession(Session): +class TkinterSession(Session): def __init__(self, config = None, channel = None): super(ReportSession, self).__init__(config) @@ -44,5 +44,5 @@ def sendreport(self, report): self.channel.send(report.to_channel()) -TkinterSession = ReportSession +ReportSession = TkinterSession From guido at codespeak.net Fri Jan 19 17:24:03 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Fri, 19 Jan 2007 17:24:03 +0100 (CET) Subject: [py-svn] r37014 - in py/dist/py/apigen: . testing Message-ID: <20070119162403.A539E10078@code0.codespeak.net> Author: guido Date: Fri Jan 19 17:23:59 2007 New Revision: 37014 Modified: py/dist/py/apigen/apigen.py py/dist/py/apigen/htmlgen.py py/dist/py/apigen/linker.py py/dist/py/apigen/testing/test_apigen_example.py py/dist/py/apigen/testing/test_htmlgen.py Log: Cleanup in the tests: I'm using a Linker class in the tests now that just returns a certain string instead of raising a KeyError in get_target(), which makes that a lot of the cruft (first pass stuff that was basically only there to satisfy the linker) could be removed. Added source navigation. Modified: py/dist/py/apigen/apigen.py ============================================================================== --- py/dist/py/apigen/apigen.py (original) +++ py/dist/py/apigen/apigen.py Fri Jan 19 17:23:59 2007 @@ -35,7 +35,7 @@ targetdir.ensure(dir=True) all_names = dsa._get_names(filter=lambda x, y: True) - namespace_tree = htmlgen.create_namespace_tree(dsa, all_names) + namespace_tree = htmlgen.create_namespace_tree(all_names) ns_data = htmlgen.prepare_namespace_api_pages(l, dsa, targetdir, namespace_tree) class_names = dsa.get_class_names() @@ -53,5 +53,5 @@ htmlgen.build_class_api_pages(l, class_data, proj, targetdir) htmlgen.build_method_api_pages(l, method_data, proj, targetdir) htmlgen.build_function_api_pages(l, func_data, proj, targetdir) - htmlgen.build_source_pages(l, source_data, proj, targetdir) + htmlgen.build_source_pages(l, source_data, proj, pkgdir, targetdir) Modified: py/dist/py/apigen/htmlgen.py ============================================================================== --- py/dist/py/apigen/htmlgen.py (original) +++ py/dist/py/apigen/htmlgen.py Fri Jan 19 17:23:59 2007 @@ -66,6 +66,21 @@ # XXX copy and modify formatargspec to produce html return H.em(inspect.formatargspec(*inspect.getargspec(func))) +def create_namespace_tree(dotted_names): + """ creates a tree (in dict form) from a set of dotted names + """ + ret = {} + for dn in dotted_names: + path = dn.split('.') + for i in xrange(len(path)): + ns = '.'.join(path[:i]) + itempath = '.'.join(path[:i + 1]) + if ns not in ret: + ret[ns] = [] + if itempath not in ret[ns]: + ret[ns].append(itempath) + return ret + def build_full_method_view(base, linker, dsa, dotted_name): """ build the html for a class method """ func = dsa.get_obj(dotted_name) @@ -156,8 +171,8 @@ return snippet # XXX nav functions need cleanup!! -def build_navitem_html(linker, name, dotted_name, indent, selected): - href = linker.get_lazyhref(dotted_name) +def build_navitem_html(linker, name, linkid, indent, selected): + href = linker.get_lazyhref(linkid) navitem = H.NavigationItem((indent * 2 * u'\xa0'), H.a(name, href=href)) if selected: navitem.attr.class_ = 'selected' @@ -195,41 +210,104 @@ item_dotted_name, indent, selected)) return H.Navigation(*navitems) +def source_dirs_files(fspath): + """ returns a tuple (dirs, files) for fspath + + dirs are all the subdirs, files are the files which are interesting + in building source documentation for a Python code tree (basically all + normal files excluding .pyc and .pyo ones) + + all files and dirs that have a name starting with . are considered + hidden + """ + dirs = [] + files = [] + for child in fspath.listdir(): + if child.basename.startswith('.'): + continue + if child.check(dir=True): + dirs.append(child) + elif child.check(file=True): + if child.ext in ['.pyc', '.pyo']: + continue + files.append(child) + return dirs, files + +def build_source_navigation(linker, projroot, fspath, outputpath): + nav = H.Navigation() + relpath = fspath.relto(projroot) + path = relpath.split('/') + indent = 0 + # build links to parents + for i in xrange(len(path)): + dirpath = '/'.join(path[:i]) + abspath = projroot.join(dirpath).strpath + if i == 0: + text = 'root' + else: + text = path[i-1] + nav.append(build_navitem_html(linker, text, abspath, indent, False)) + indent += 1 + # build siblings or children and self + if fspath.check(dir=True): + # we're a dir, build ourselves and our children + dirpath = fspath + nav.append(build_navitem_html(linker, dirpath.basename, + dirpath.strpath, indent, True)) + indent += 1 + elif fspath.strpath == projroot.strpath: + dirpath = fspath + else: + # we're a file, build our parent's children only + dirpath = fspath.dirpath() + diritems, fileitems = source_dirs_files(dirpath) + for dir in sorted(diritems): + nav.append(build_navitem_html(linker, dir.basename, dir.strpath, + indent, False)) + for file in sorted(fileitems): + selected = (fspath.check(file=True) and + file.basename == fspath.basename) + nav.append(build_navitem_html(linker, file.basename, file.strpath, + indent, selected)) + return nav + re = py.std.re _reg_body = re.compile(r']*>(.*)', re.S) -def build_source_python_page(linker, fspath): +def build_source_python_page(linker, projroot, fspath, outputpath): mod = source_browser.parse_path(fspath) # XXX let's cheat a bit here... there should be a different function using # the linker, and returning a proper py.xml.html element, at some point html = source_html.create_html(mod) snippet = _reg_body.search(html).group(1) tag = H.SourceDef(raw(snippet)) - nav = H.Navigation('navigation') + nav = build_source_navigation(linker, projroot, fspath, outputpath) return tag, nav -def build_source_dir_page(linker, fspath): +def build_source_dir_page(linker, projroot, fspath, outputpath): tag = H.DirList() for path in fspath.listdir(): if path.ext in ['.pyc', '.pyo'] or path.basename.startswith('.'): continue tag.append(H.DirListItem(H.a(path.basename, href=linker.get_lazyhref(str(path))))) - nav = H.Navigation('navigation') + nav = build_source_navigation(linker, projroot, fspath, outputpath) return tag, nav -def build_source_nonpython_page(linker, fspath): +def build_source_nonpython_page(linker, projroot, fspath, outputpath): try: tag = H.NonPythonSource(unicode(fspath.read(), 'utf-8')) except UnicodeError: tag = H.NonPythonSource('no source available (binary file?)') - nav = H.Navigation('navigation') + nav = build_source_navigation(linker, projroot, fspath, outputpath) return tag, nav # the build_*_pages methods all do two-pass page generation (first pass builds # the link db, second uses it) def prepare_source_pages(linker, base, outputbase): passed = [] - for fspath in base.visit(): + for fspath in [base] + list(base.visit()): + if fspath.ext in ['.pyc', '.pyo']: + continue relfspath = fspath.relto(base) if relfspath.find('/.') > -1: # skip hidden dirs and files @@ -243,24 +321,35 @@ passed.append((fspath, outputpath)) return passed -def build_source_pages(linker, data, project, outputbase): +def build_source_pages(linker, data, project, projroot, outputbase): """ build syntax-colored source views """ for fspath, outputpath in data: if fspath.check(ext='.py'): try: - tag, nav = build_source_python_page(linker, fspath) + tag, nav = build_source_python_page(linker, projroot, fspath, + outputpath) except (KeyboardInterrupt, SystemError): raise except: # XXX strange stuff going wrong at times... need to fix - tag, nav = build_source_nonpython_page(linker, fspath) + exc, e, tb = py.std.sys.exc_info() + print '%s - %s' % (exc, e) + print + print ''.join(py.std.traceback.format_tb(tb)) + print '-' * 79 + del tb + tag, nav = build_source_nonpython_page(linker, projroot, + fspath, outputpath) elif fspath.check(dir=True): - tag, nav = build_source_dir_page(linker, fspath) + tag, nav = build_source_dir_page(linker, projroot, fspath, + outputpath) else: - tag, nav = build_source_nonpython_page(linker, fspath) + tag, nav = build_source_nonpython_page(linker, projroot, fspath, + outputpath) page = wrap_page(project, 'sources for %s' % (fspath.basename,), tag, nav, outputbase) outputpath.ensure() - content = page.unicode() #linker.call_withbase(reltargetpath, page.unicode) + reltargetpath = outputpath.relto(outputbase) + content = linker.call_withbase(reltargetpath, page.unicode) outputpath.write(content.encode("utf8")) def prepare_class_api_pages(linker, dsa, base, namespace_tree, @@ -346,20 +435,6 @@ targetpath.ensure() targetpath.write(content.encode("utf8")) -def create_namespace_tree(dsa, dotted_names): - ret = {} - class_names = dsa.get_class_names() - for dn in dotted_names: - path = dn.split('.') - for i in xrange(len(path)): - ns = '.'.join(path[:i]) - itempath = '.'.join(path[:i + 1]) - if ns not in ret: - ret[ns] = [] - if itempath not in ret[ns]: - ret[ns].append(itempath) - return ret - def prepare_namespace_api_pages(linker, dsa, base, namespace_tree): passed = [] module_name = dsa.get_module_name().split('/')[-1] Modified: py/dist/py/apigen/linker.py ============================================================================== Modified: py/dist/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_example.py (original) +++ py/dist/py/apigen/testing/test_apigen_example.py Fri Jan 19 17:23:59 2007 @@ -70,11 +70,16 @@ cls.project = Project() def setup_method(self, meth): - self.linker = Linker() + class LinkerForTests(Linker): + def get_target(self, linkid): + try: + return super(LinkerForTests, self).get_target(linkid) + except KeyError: + return 'unknown_link_%s' % (linkid,) + self.linker = LinkerForTests() def test_build_full_method_view(self): base = py.test.ensuretemp('build_full_method_view') - prepare_source_pages(self.linker, self.fs_root, base) snippet = build_full_method_view(base, self.linker, self.dsa, 'pkg.sub.func') html = snippet.unicode() @@ -82,13 +87,9 @@ def test_build_function_api_pages(self): base = py.test.ensuretemp('build_function_api_pages') - prepare_source_pages(self.linker, self.fs_root, base) - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.sub', 'pkg.sub.func', + namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) - prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) data = prepare_function_api_pages(self.linker, self.dsa, base, namespace_tree, ['pkg.sub.func']) @@ -100,7 +101,6 @@ def test_build_class_view(self): base = py.test.ensuretemp('build_class_view') - prepare_source_pages(self.linker, self.fs_root, base) snippet = build_class_view(base, self.linker, self.dsa, 'pkg.SomeClass') html = snippet.unicode() @@ -108,19 +108,14 @@ def test_build_class_api_pages(self): base = py.test.ensuretemp('build_class_api_pages') - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.SomeClass', + namespace_tree = create_namespace_tree(['pkg.SomeClass', 'pkg.SomeSubClass', 'pkg.sub.func']) data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, base, namespace_tree, ['pkg.SomeClass', 'pkg.SomeSubClass']) - prepare_source_pages(self.linker, self.fs_root, base) - prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) build_class_api_pages(self.linker, data, self.project, base) - build_method_api_pages(self.linker, methodsdata, self.project, base) clsfile = base.join('api/pkg.SomeClass.html') assert clsfile.check() html = clsfile.read() @@ -128,79 +123,84 @@ def test_build_class_api_pages_nav_links(self): base = py.test.ensuretemp('build_class_api_pages_nav_links') - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.SomeClass', + namespace_tree = create_namespace_tree(['pkg.SomeClass', 'pkg.SomeSubClass', 'pkg.sub.func']) data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, base, namespace_tree, ['pkg.SomeSubClass', 'pkg.SomeClass']) - prepare_source_pages(self.linker, self.fs_root, base) - prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) + # fake some stuff that would be built from other methods + self.linker.set_link('', 'api/index.html') + self.linker.set_link('pkg', 'api/pkg.html') build_class_api_pages(self.linker, data, self.project, base) - build_method_api_pages(self.linker, methodsdata, self.project, base) clsfile = base.join('api/pkg.SomeClass.html') assert clsfile.check() html = clsfile.read() print html - assert 'href="index.html"' in html - assert 'href="pkg.html"' in html - assert 'href="pkg.SomeClass.html"' in html - assert 'href="pkg.SomeSubClass.html"' in html - assert 'href="pkg.sub.html"' in html + # note that the root and the first level both have the same name (pkg) + # in our example project (XXX fixme!!) + assert 'href="index.html">pkg' in html + assert 'href="pkg.html">pkg' in html + assert 'href="pkg.SomeClass.html">SomeClass' in html + assert 'href="pkg.SomeSubClass.html">SomeSubClass' in html assert not 'href="pkg.sub.func.html"' in html + py.test.skip('WOP from here') + assert 'href="pkg.sub.html">sub' in html _checkhtml(html) def test_build_class_api_pages_base_link(self): base = py.test.ensuretemp('build_class_api_pages_base_link') - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.SomeClass', + namespace_tree = create_namespace_tree(['pkg.SomeClass', 'pkg.SomeSubClass', 'pkg.sub.func']) data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, base, namespace_tree, ['pkg.SomeSubClass', 'pkg.SomeClass']) - prepare_source_pages(self.linker, self.fs_root, base) - prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) build_class_api_pages(self.linker, data, self.project, base) - build_method_api_pages(self.linker, methodsdata, self.project, base) clsfile = base.join('api/pkg.SomeSubClass.html') assert clsfile.check() html = clsfile.read() - assert html.find('href="pkg.SomeClass.html">pkg.SomeClass') > -1 + assert 'href="pkg.SomeClass.html">pkg.SomeClass' in html _checkhtml(html) def test_build_source_pages(self): base = py.test.ensuretemp('build_source_pages') data = prepare_source_pages(self.linker, self.fs_root, base) - build_source_pages(self.linker, data, self.project, base) + build_source_pages(self.linker, data, self.project, self.fs_root, base) somesource = base.join('source/pkg/func.py.html').read() _checkhtml(somesource) + def test_build_source_pages_nav(self): + base = py.test.ensuretemp('build_source_pages_nav') + data = prepare_source_pages(self.linker, self.fs_root, base) + build_source_pages(self.linker, data, self.project, self.fs_root, base) + funcsource = base.join('source/pkg/func.py.html') + assert funcsource.check(file=True) + html = funcsource.read() + print html + #assert 'py' in html + assert 'pkg' in html + assert 'someclass.py' in html + assert 'somesubclass.py' in html + def test_api_source_links(self): base = py.test.ensuretemp('api_source_links') - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.SomeClass', + namespace_tree = create_namespace_tree(['pkg.SomeClass', 'pkg.SomeSubClass', 'pkg.sub.func']) data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, base, namespace_tree, ['pkg.SomeSubClass', 'pkg.SomeClass']) sourcedata = prepare_source_pages(self.linker, self.fs_root, base) - prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) build_class_api_pages(self.linker, data, self.project, base) - build_method_api_pages(self.linker, methodsdata, self.project, base) - build_source_pages(self.linker, sourcedata, self.project, base) + build_source_pages(self.linker, sourcedata, self.project, self.fs_root, + base) funchtml = base.join('api/pkg.SomeClass.html').read() assert funchtml.find('href="../source/pkg/someclass.py.html"') > -1 _checkhtml(funchtml) def test_create_namespace_tree(self): - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.sub.func', + namespace_tree = create_namespace_tree(['pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) assert namespace_tree == {'': ['pkg'], @@ -210,8 +210,7 @@ def test_build_namespace_api_pages_index(self): base = py.test.ensuretemp('build_namespace_api_pages') - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.sub', 'pkg.sub.func', + namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) data = prepare_namespace_api_pages(self.linker, self.dsa, base, @@ -230,18 +229,11 @@ def test_build_namespace_api_pages_subnamespace(self): base = py.test.ensuretemp('build_namespace_api_pages') - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.sub', 'pkg.sub.func', + namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) data = prepare_namespace_api_pages(self.linker, self.dsa, base, namespace_tree) - prepare_class_api_pages(self.linker, self.dsa, base, - namespace_tree, - ['pkg.SomeClass', 'pkg.SomeSubClass']) - prepare_function_api_pages(self.linker, self.dsa, base, - namespace_tree, ['pkg.sub.func']) - prepare_source_pages(self.linker, self.fs_root, base) build_namespace_api_pages(self.linker, data, self.project, base) subfile = base.join('api/pkg.sub.html') assert subfile.check() @@ -251,29 +243,30 @@ def test_build_source_dir_page(self): base = py.test.ensuretemp('build_source_dir_page') data = prepare_source_pages(self.linker, self.fs_root, base) - build_source_pages(self.linker, data, self.project, base) + build_source_pages(self.linker, data, self.project, self.fs_root, base) pkgindex = base.join('source/pkg/index.html') assert pkgindex.check(file=True) html = pkgindex.read() - assert ('someclass.py' - in html) + print html + assert 'someclass.py' in html _checkhtml(html) def test_build_function_api_pages_nav(self): base = py.test.ensuretemp('build_function_api_pages_nav') prepare_source_pages(self.linker, self.fs_root, base) - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.sub', 'pkg.sub.func', + namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) - prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) data = prepare_function_api_pages(self.linker, self.dsa, base, namespace_tree, ['pkg.sub.func']) + self.linker.set_link('', 'api/index.html') + self.linker.set_link('pkg', 'api/pkg.html') + self.linker.set_link('pkg.sub', 'api/pkg.sub.html') build_function_api_pages(self.linker, data, self.project, base) funcfile = base.join('api/pkg.sub.func.html') html = funcfile.read() + print html assert '' in html assert '' in html assert '' in html @@ -282,8 +275,7 @@ def test_build_function_navigation(self): base = py.test.ensuretemp('build_function_navigation') prepare_source_pages(self.linker, self.fs_root, base) - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.sub', 'pkg.sub.func', + namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) prepare_namespace_api_pages(self.linker, self.dsa, base, @@ -304,18 +296,11 @@ def test_build_root_namespace_view(self): base = py.test.ensuretemp('build_root_namespace_view') - prepare_source_pages(self.linker, self.fs_root, base) - namespace_tree = create_namespace_tree(self.dsa, - ['pkg.sub', 'pkg.sub.func', + namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) data = prepare_namespace_api_pages(self.linker, self.dsa, base, namespace_tree) - prepare_function_api_pages(self.linker, self.dsa, base, - namespace_tree, ['pkg.sub.func']) - prepare_class_api_pages(self.linker, self.dsa, base, - namespace_tree, - ['pkg.SomeClass', 'pkg.SomeSubClass']) build_namespace_api_pages(self.linker, data, self.project, base) rootfile = base.join('api/index.html') assert rootfile.check() @@ -323,3 +308,17 @@ assert '' in html _checkhtml(html) + def test_build_source_navigation_root(self): + base = py.test.ensuretemp('test_build_source_navigation') + prepare_source_pages(self.linker, self.fs_root, base) + nav = build_source_navigation(self.linker, self.fs_root, + self.fs_root.join('pkg'), base) + html = nav.unicode(indent=0) + print html.encode('UTF-8') + # XXX fix the double slash!! + assert 'href="source//index.html">root' in html + assert 'href="source/pkg/index.html">pkg' in html + assert 'href="source/pkg/func.py.html">func.py' in html + assert 'href="source/pkg/someclass.py.html">someclass.py' in html + assert 'href="source/pkg/somesubclass.py.html">somesubclass.py' in html + Modified: py/dist/py/apigen/testing/test_htmlgen.py ============================================================================== --- py/dist/py/apigen/testing/test_htmlgen.py (original) +++ py/dist/py/apigen/testing/test_htmlgen.py Fri Jan 19 17:23:59 2007 @@ -1,12 +1,38 @@ -from py.__.apigen.htmlgen import build_navitem_html +import py +from py.__.apigen import htmlgen from py.__.apigen.linker import Linker +def test_create_namespace_tree(): + tree = htmlgen.create_namespace_tree(['foo.bar.baz']) + assert tree == {'': ['foo'], + 'foo': ['foo.bar'], + 'foo.bar': ['foo.bar.baz']} + tree = htmlgen.create_namespace_tree(['foo.bar.baz', 'foo.bar.qux']) + assert tree == {'': ['foo'], + 'foo': ['foo.bar'], + 'foo.bar': ['foo.bar.baz', 'foo.bar.qux']} + def test_build_navitem_html(): l = Linker() l.set_link('spam.eggs.foo', 'foo.html') - h = build_navitem_html(l, 'foo', 'spam.eggs.foo', 0, False) + h = htmlgen.build_navitem_html(l, 'foo', 'spam.eggs.foo', 0, False) assert unicode(h) == u'

foo

' - h = build_navitem_html(l, 'bar', 'spam.eggs.foo', 1, True) + h = htmlgen.build_navitem_html(l, 'bar', 'spam.eggs.foo', 1, True) assert unicode(h) == (u'

\xa0\xa0' u'bar

') +def test_source_dirs_files(): + temp = py.test.ensuretemp('test_source_dirs_files') + temp.join('dir').ensure(dir=True) + temp.join('dir/file1.py').ensure(file=True) + temp.join('dir/file2.pyc').ensure(file=True) + temp.join('dir/file3.c').ensure(file=True) + temp.join('dir/.hidden_file').ensure(file=True) + temp.join('dir/sub').ensure(dir=True) + temp.join('dir/.hidden_dir').ensure(dir=True) + dirs, files = htmlgen.source_dirs_files(temp.join('dir')) + dirnames = sorted([d.basename for d in dirs]) + filenames = sorted([f.basename for f in files]) + assert dirnames == ['sub'] + assert filenames == ['file1.py', 'file3.c'] + From fijal at codespeak.net Fri Jan 19 17:24:38 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 17:24:38 +0100 (CET) Subject: [py-svn] r37015 - in py/branch/config/py/test/rsession: . testing Message-ID: <20070119162438.2DE8E10079@code0.codespeak.net> Author: fijal Date: Fri Jan 19 17:24:32 2007 New Revision: 37015 Modified: py/branch/config/py/test/rsession/hostmanage.py py/branch/config/py/test/rsession/rsession.py py/branch/config/py/test/rsession/testing/test_rsession.py Log: Major cleanup of hostmanage. Got rid of global functions in favor of some better-structured classes. Modified: py/branch/config/py/test/rsession/hostmanage.py ============================================================================== --- py/branch/config/py/test/rsession/hostmanage.py (original) +++ py/branch/config/py/test/rsession/hostmanage.py Fri Jan 19 17:24:32 2007 @@ -60,107 +60,143 @@ class DummyGateway(object): pass -def prepare_gateway(sshosts, optimise_localhost, - remote_python, pkgdir, real_create=True): - hosts = [] - for host in sshosts: - if host.hostname != 'localhost' or not optimise_localhost: - if real_create: - # for tests we want to use somtehing different - if host.hostname == 'localhost' and optimise_localhost is False: - from py.__.execnet.register import PopenCmdGateway - gw = PopenCmdGateway("cd ~; python -u -c 'exec input()'") - if not host.relpath.startswith("/"): - host.relpath = os.environ['HOME'] + '/' + host.relpath - else: - if remote_python is None: - gw = py.execnet.SshGateway(host.hostname) - else: - gw = py.execnet.SshGateway(host.hostname, - remotepython=remote_python) - else: - gw = DummyGateway() - else: - if remote_python is None: - gw = py.execnet.PopenGateway() - else: - gw = py.execnet.PopenGateway(python=remote_python) - host.relpath = str(pkgdir.dirpath()) - host.gw = gw - gw.host = host - return sshosts - -def init_hosts(reporter, sshhosts, pkgdir, rsync_roots=None, - remote_python=None, \ - config=None, optimise_localhost=True,\ - do_sync=True, done_dict=None): - if done_dict is None: - done_dict = {} - assert pkgdir.join("__init__.py").check(), ( +class HostOptions(object): + """ Dummy container for host options, not to keep that + as different function parameters, mostly related to + tests only + """ + def __init__(self, rsync_roots=None, remote_python="python", + optimise_localhost=True, do_sync=True, + create_gateways=True): + self.rsync_roots = rsync_roots + self.remote_python = remote_python + self.optimise_localhost = optimise_localhost + self.do_sync = do_sync + self.create_gateways = create_gateways + +class HostManager(object): + def __init__(self, sshhosts, config, pkgdir, options=HostOptions()): + self.sshhosts = sshhosts + self.pkgdir = pkgdir + self.config = config + self.options = options + if not options.create_gateways: + self.prepare_gateways = self.prepare_dummy_gateways + assert pkgdir.join("__init__.py").check(), ( "%s probably wrong" %(pkgdir,)) - exc_info = [None] - hosts = prepare_gateway(sshhosts, optimise_localhost, - remote_python, pkgdir, real_create=do_sync) - - # rsyncing - rsynced = {} - - if do_sync: - rsync = HostRSync(rsync_roots) - for host in hosts: - #for num, host, gw, remoterootpath in hosts: - remoterootpath = host.relpath - if (host.hostname, remoterootpath) in rsynced or\ - (host.hostname == 'localhost' and optimise_localhost): - reporter(report.HostReady(host)) - continue - rsynced[(host.hostname, host.relpath)] = True - def done(host=host): - reporter(report.HostReady(host)) - reporter(report.HostRSyncing(host)) - if do_sync: - rsync.add_target(host.gw, remoterootpath, done) - if not do_sync: - return # for testing only - rsync.send(pkgdir.dirpath()) - - # hosts ready - return setup_nodes(hosts, pkgdir, config, reporter, done_dict) - -def setup_nodes(hosts, pkgdir, config, reporter, done_dict): - nodes = [] - for host in hosts: - ch = setup_slave(host.gw, os.path.join(host.relpath,\ - pkgdir.basename), config) - nodes.append(MasterNode(ch, reporter, done_dict)) + def prepare_dummy_gateways(self): + for host in self.sshhosts: + gw = DummyGateway() + host.gw = gw + gw.host = host + return self.sshhosts + + def prepare_ssh_gateway(self, host): + if self.options.remote_python is None: + gw = py.execnet.SshGateway(host.hostname) + else: + gw = py.execnet.SshGateway(host.hostname, + remotepython=self.options.remote_python) + return gw + + def prepare_popen_rsync_gateway(self, host): + """ Popen gateway, but with forced rsync + """ + from py.__.execnet.register import PopenCmdGateway + gw = PopenCmdGateway("cd ~; python -u -c 'exec input()'") + if not host.relpath.startswith("/"): + host.relpath = os.environ['HOME'] + '/' + host.relpath + return gw + + def prepare_popen_gateway(self, host): + if self.options.remote_python is None: + gw = py.execnet.PopenGateway() + else: + gw = py.execnet.PopenGateway(python=self.options.remote_python) + host.relpath = str(self.pkgdir.dirpath()) + return gw + + def prepare_gateways(self): + for host in self.sshhosts: + if host.hostname == 'localhost': + if not self.options.optimise_localhost: + gw = self.prepare_popen_rsync_gateway(host) + else: + gw = self.prepare_popen_gateway(host) + else: + gw = self.prepare_ssh_gateway(host) + host.gw = gw + gw.host = host + return self.sshhosts + + def need_rsync(self, rsynced, hostname, remoterootpath): + if (hostname, remoterootpath) in rsynced: + return False + if hostname == 'localhost' and self.options.optimise_localhost: + return False + return True + + def init_hosts(self, reporter, done_dict={}): + if done_dict is None: + done_dict = {} + + hosts = self.prepare_gateways() + + # rsyncing + rsynced = {} + + if self.options.do_sync: + rsync = HostRSync(self.options.rsync_roots) + for host in hosts: + if not self.need_rsync(rsynced, host.hostname, host.relpath): + reporter(report.HostReady(host)) + continue + rsynced[(host.hostname, host.relpath)] = True + def done(host=host): + reporter(report.HostReady(host)) + reporter(report.HostRSyncing(host)) + if self.options.do_sync: + rsync.add_target(host.gw, host.relpath, done) + if not self.options.do_sync: + return # for testing only + rsync.send(self.pkgdir.dirpath()) + # hosts ready + return self.setup_nodes(reporter, done_dict) + + def setup_nodes(self, reporter, done_dict): + nodes = [] + for host in self.sshhosts: + ch = setup_slave(host.gw, os.path.join(host.relpath,\ + self.pkgdir.basename), self.config) + nodes.append(MasterNode(ch, reporter, done_dict)) - return nodes + return nodes -def teardown_hosts(reporter, channels, nodes, waiter=lambda : time.sleep(.1), - exitfirst=False): - for channel in channels: - channel.send(None) + def teardown_hosts(self, reporter, channels, nodes, + waiter=lambda : time.sleep(.1), exitfirst=False): + for channel in channels: + channel.send(None) - clean = exitfirst - while not clean: - clean = True - for node in nodes: - if node.pending: - clean = False - waiter() - teardown_gateways(reporter, channels) - -def kill_channels(channels): - for channel in channels: - channel.send(42) - -def teardown_gateways(reporter, channels): - for channel in channels: - try: - report.wrapcall(reporter, channel.waitclose) - except KeyboardInterrupt, SystemExit: - raise - except: - pass - channel.gateway.exit() + clean = exitfirst + while not clean: + clean = True + for node in nodes: + if node.pending: + clean = False + waiter() + self.teardown_gateways(reporter, channels) + + def kill_channels(self, channels): + for channel in channels: + channel.send(42) + + def teardown_gateways(self, reporter, channels): + for channel in channels: + try: + report.wrapcall(reporter, channel.waitclose) + except KeyboardInterrupt, SystemExit: + raise + except: + pass + channel.gateway.exit() Modified: py/branch/config/py/test/rsession/rsession.py ============================================================================== --- py/branch/config/py/test/rsession/rsession.py (original) +++ py/branch/config/py/test/rsession/rsession.py Fri Jan 19 17:24:32 2007 @@ -11,8 +11,7 @@ from py.__.test.rsession import report from py.__.test.rsession.master import \ setup_slave, MasterNode, dispatch_loop, itemgen, randomgen -from py.__.test.rsession.hostmanage import init_hosts, teardown_hosts, HostInfo,\ - teardown_gateways, kill_channels +from py.__.test.rsession.hostmanage import HostInfo, HostOptions, HostManager from py.__.test.rsession.local import local_loop, plain_runner, apigen_runner,\ box_runner @@ -136,22 +135,25 @@ pkgdir = self.getpkgdir(args[0]) done_dict = {} + hostopts = HostOptions(rsync_roots=rsync_roots, + remote_python=remotepython, + optimise_localhost=self.optimise_localhost) + hostmanager = HostManager(sshhosts, self.config, pkgdir, hostopts) try: - nodes = init_hosts(reporter, sshhosts, pkgdir, - rsync_roots, remotepython, config=self.config, - optimise_localhost=self.optimise_localhost, done_dict=done_dict) + nodes = hostmanager.init_hosts(reporter, done_dict) reporter(report.RsyncFinished()) try: self.dispatch_tests(nodes, args, pkgdir, reporter, checkfun, done_dict) except (KeyboardInterrupt, SystemExit): print >>sys.stderr, "C-c pressed waiting for gateways to teardown..." channels = [node.channel for node in nodes] - kill_channels(channels) - teardown_gateways(reporter, channels) + hostmanager.kill_channels(channels) + hostmanager.teardown_gateways(reporter, channels) print >>sys.stderr, "... Done" raise - teardown_hosts(reporter, [node.channel for node in nodes], nodes, + channels = [node.channel for node in nodes] + hostmanager.teardown_hosts(reporter, channels, nodes, exitfirst=self.config.option.exitfirst) reporter(report.Nodes(nodes)) retval = reporter(report.TestFinished()) Modified: py/branch/config/py/test/rsession/testing/test_rsession.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_rsession.py (original) +++ py/branch/config/py/test/rsession/testing/test_rsession.py Fri Jan 19 17:24:32 2007 @@ -6,7 +6,7 @@ from py.__.test.rsession import report from py.__.test.rsession.rsession import RSession, parse_directories,\ parse_directories -from py.__.test.rsession.hostmanage import init_hosts, teardown_hosts,\ +from py.__.test.rsession.hostmanage import HostOptions, HostManager,\ HostInfo from py.__.test.rsession.testing.test_slave import funcfail_spec,\ funcpass_spec, funcskip_spec, funcprint_spec, funcprintfail_spec, \ @@ -18,7 +18,8 @@ def test_setup_non_existing_hosts(): setup_events = [] hosts = [HostInfo("alskdjalsdkjasldkajlsd")] - cmd = "init_hosts(setup_events.append, hosts, pkgdir)" + hm = HostManager(hosts, None, pkgdir) + cmd = "hm.init_hosts(setup_events.append)" py.test.raises((py.process.cmdexec.Error, IOError, EOFError), cmd) #assert setup_events @@ -159,10 +160,10 @@ teardown_events = [] config = py.test.config._reparse([]) - nodes = init_hosts(setup_events.append, hosts, pkgdir, - rsync_roots=["py"], optimise_localhost=False, - config=config) - teardown_hosts(teardown_events.append, + opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) + hm = HostManager(hosts, config, pkgdir, opts) + nodes = hm.init_hosts(setup_events.append) + hm.teardown_hosts(teardown_events.append, [node.channel for node in nodes], nodes) count_rsyn_calls = [i for i in setup_events @@ -186,9 +187,9 @@ allevents = [] config = py.test.config._reparse([]) - nodes = init_hosts(allevents.append, hosts, pkgdir, - rsync_roots=["py"], optimise_localhost=False, - config=config) + opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) + hm = HostManager(hosts, config, pkgdir, opts) + nodes = hm.init_hosts(allevents.append) from py.__.test.rsession.testing.test_executor \ import ItemTestPassing, ItemTestFailing, ItemTestSkipping @@ -206,7 +207,7 @@ node.send(itemskip) node.send(itemprint) - teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) + hm.teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) events = [i for i in allevents if isinstance(i, report.ReceivedItemOutcome)] @@ -233,9 +234,9 @@ from py.__.test.rsession.master import defaultconftestnames defaultconftestnames.append("custom") try: - nodes = init_hosts(allevents.append, hosts, pkgdir, - rsync_roots=["py"], config=config, - optimise_localhost=False) + opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) + hm = HostManager(hosts, config, pkgdir, opts) + nodes = hm.init_hosts(allevents.append) rootcol = py.test.collect.Directory(pkgdir.dirpath()) itempass = rootcol.getitembynames(funcoptioncustom_spec) @@ -243,7 +244,7 @@ for node in nodes: node.send(itempass) - teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) + hm.teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) events = [i for i in allevents if isinstance(i, report.ReceivedItemOutcome)] passed = [i for i in events @@ -305,7 +306,10 @@ hostnames = ['h1:/tmp', 'h1:/tmp', 'h1:/other', 'h2', 'h2:home'] hosts = [HostInfo(i) for i in hostnames] parse_directories(hosts) - init_hosts(testevents.append, hosts, pkgdir, do_sync=False) + config = py.test.config._reparse([]) + opts = HostOptions(do_sync=False, create_gateways=False) + hm = HostManager(hosts, config, pkgdir, opts) + nodes = hm.init_hosts(testevents.append) events = [i for i in testevents if isinstance(i, report.HostRSyncing)] assert len(events) == 4 assert events[0].host.hostname == 'h1' From cfbolz at codespeak.net Fri Jan 19 17:29:35 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 17:29:35 +0100 (CET) Subject: [py-svn] r37016 - py/dist/py/rest Message-ID: <20070119162935.66DF310078@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 17:29:33 2007 New Revision: 37016 Modified: py/dist/py/rest/latex.py Log: another missing quote Modified: py/dist/py/rest/latex.py ============================================================================== --- py/dist/py/rest/latex.py (original) +++ py/dist/py/rest/latex.py Fri Jan 19 17:29:33 2007 @@ -122,7 +122,7 @@ if stylesheet is not None: sty = path.join(stylesheet) if sty.check(): - options.append("--stylesheet=%s" % (sty, )) + options.append('--stylesheet="%s"' % (sty, )) options.append(f.new(basename=tex)) options = map(str, options) if rest_options is not None: From fijal at codespeak.net Fri Jan 19 17:33:18 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 17:33:18 +0100 (CET) Subject: [py-svn] r37018 - py/branch/config/py/test/testing Message-ID: <20070119163318.7F84710078@code0.codespeak.net> Author: fijal Date: Fri Jan 19 17:33:14 2007 New Revision: 37018 Modified: py/branch/config/py/test/testing/test_config.py Log: Little clarification Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Fri Jan 19 17:33:14 2007 @@ -161,8 +161,10 @@ for x in optnames: config = py.test.config._reparse([self.tmpdir, '--%s' % x]) assert config._getsessionname() == 'LSession' + + for x in 'startserver runbrowser rest'.split(): config = py.test.config._reparse([self.tmpdir, '--dist', '--%s' % x]) - assert config._getsessionname() == 'RSession' # XXX is this right? + assert config._getsessionname() == 'RSession' def test_tkintersession(self): config = py.test.config._reparse([self.tmpdir, '--tkinter']) From hpk at codespeak.net Fri Jan 19 17:34:26 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Fri, 19 Jan 2007 17:34:26 +0100 (CET) Subject: [py-svn] r37019 - py/branch/config/py/test/testing Message-ID: <20070119163426.234B21007A@code0.codespeak.net> Author: hpk Date: Fri Jan 19 17:34:24 2007 New Revision: 37019 Modified: py/branch/config/py/test/testing/test_config.py Log: check that custom session names are correctly looked up Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Fri Jan 19 17:34:24 2007 @@ -176,8 +176,15 @@ cls = config._lookupsession(name) assert cls.__name__ == name - def XXXtest_sessionname_lookup_custom(self): - config = py.test.config._reparse([]) - for name in 'TerminalSession LSession RSession TkinterSession'.split(): - cls = config._lookupsession(name) - assert py.std.inspect.isclass(cls) + def test_sessionname_lookup_custom(self): + self.tmpdir.join("conftest.py").write(py.code.Source(""" + TerminalSession = 0 + TkinterSession = 1 + RSession = 2 + LSession = 3 + """)) + config = py.test.config._reparse([self.tmpdir]) + assert config._lookupsession('TerminalSession') == 0 + assert config._lookupsession('TkinterSession') == 1 + assert config._lookupsession('RSession') == 2 + assert config._lookupsession('LSession') == 3 From hpk at codespeak.net Fri Jan 19 17:48:18 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Fri, 19 Jan 2007 17:48:18 +0100 (CET) Subject: [py-svn] r37020 - in py/branch/config/py: apigen/testing test test/testing Message-ID: <20070119164818.55FA61007A@code0.codespeak.net> Author: hpk Date: Fri Jan 19 17:48:15 2007 New Revision: 37020 Modified: py/branch/config/py/apigen/testing/test_apigen_functional.py py/branch/config/py/test/cmdline.py py/branch/config/py/test/config.py py/branch/config/py/test/defaultconftest.py py/branch/config/py/test/testing/test_session.py Log: switching in the new way of getting to a sessionclass, removing code in cmdline.py and elsewhere accordingly Modified: py/branch/config/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/branch/config/py/apigen/testing/test_apigen_functional.py (original) +++ py/branch/config/py/apigen/testing/test_apigen_functional.py Fri Jan 19 17:48:15 2007 @@ -13,7 +13,7 @@ parentdir = py.magic.autopath().dirpath().dirpath() pkgdir = fs_root.join('pkg') output = py.process.cmdexec( - 'APIGEN_TARGET=%s py.test --session=L --apigen=%s/apigen.py %s' % ( + 'APIGEN_TARGET=%s py.test --apigen=%s/apigen.py %s' % ( tempdir, parentdir, pkgdir)) assert output.lower().find('traceback') == -1 Modified: py/branch/config/py/test/cmdline.py ============================================================================== --- py/branch/config/py/test/cmdline.py (original) +++ py/branch/config/py/test/cmdline.py Fri Jan 19 17:48:15 2007 @@ -11,23 +11,6 @@ config = py.test.config config.parse(args) sessionclass = config.getsessionclass() - - # ok, some option checks - if config.option.startserver or config.option.runbrowser: - from py.__.test.rsession.rsession import AbstractSession, LSession - if not issubclass(sessionclass, AbstractSession): - print "Cannot use web server without (R|L)Session, using lsession" - sessionclass = LSession - if config.option.apigen: - from py.__.test.rsession.rsession import AbstractSession, LSession - if not issubclass(sessionclass, AbstractSession): - sessionclass = LSession - print "Cannot generate API without (R|L)Session, using lsession" - if config.option.restreport: - from py.__.test.rsession.rsession import AbstractSession, LSession - if not issubclass(sessionclass, AbstractSession): - sessionclass = LSession - session = sessionclass(config) try: Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Fri Jan 19 17:48:15 2007 @@ -80,11 +80,8 @@ """ return Session class determined from cmdline options and looked up in initial config modules. """ - sessionname = self.option.session + 'Session' - sessionimportpaths = self.conftest.lget('sessionimportpaths') - importpath = sessionimportpaths[sessionname] - mod = __import__(importpath, None, None, ['__doc__']) - return getattr(mod, sessionname) + name = self._getsessionname() + return self._lookupsession(name) def _lookupsession(self, name): """ return session class for the given name. """ @@ -203,16 +200,6 @@ option._remote = remote or option.looponfailing option._fromremote = False - # setting a correct frontend session - if option.session: - name = option.session - elif option.tkinter: - name = 'tkinter' - else: - name = 'terminal' - name = name.capitalize() - option.session = name - if option.runbrowser and not option.startserver: print "Cannot point browser when not starting server" option.startserver = True Modified: py/branch/config/py/test/defaultconftest.py ============================================================================== --- py/branch/config/py/test/defaultconftest.py (original) +++ py/branch/config/py/test/defaultconftest.py Fri Jan 19 17:48:15 2007 @@ -10,20 +10,17 @@ additionalinfo = None -Option = py.test.config.Option - -sessionimportpaths = { - 'RSession': 'py.__.test.rsession.rsession', - 'LSession': 'py.__.test.rsession.rsession', - 'TerminalSession': 'py.__.test.terminal.terminal', - 'TkinterSession': 'py.__.test.tkinter.reportsession', -} +# =================================================== +# Default Sessions TkinterSession = 'py.__.test.tkinter.reportsession' TerminalSession = 'py.__.test.terminal.terminal' RSession = 'py.__.test.rsession.rsession' LSession = 'py.__.test.rsession.rsession' +# =================================================== +# Distributed testing specific options + #dist_hosts: needs to be provided by user #dist_rsync_roots: might be provided by user, if not present or None, # whole pkgdir will be rsynced @@ -36,6 +33,9 @@ dist_nicelevel = 0 _dist_import_pypy = False # used for regenerating JS application +# =================================================== + +Option = py.test.config.Option def adddefaultoptions(): py.test.config.addoptions('general options', Option('-v', '--verbose', @@ -79,7 +79,7 @@ "argument pointing to a script)."), ) - py.test.config.addoptions('test-session related options', + py.test.config.addoptions('options implying subprocesses (warning: beta)', Option('', '--tkinter', action="store_true", dest="tkinter", default=False, help="use tkinter test session frontend."), @@ -89,9 +89,6 @@ Option('', '--looponfailing', action="store_true", dest="looponfailing", default=False, help="loop on failing test set."), - Option('', '--session', - action="store", dest="session", default=None, - help="use given sessionclass, default is terminal."), Option('', '--exec', action="store", dest="executable", default=None, help="python executable to run the tests with."), Modified: py/branch/config/py/test/testing/test_session.py ============================================================================== --- py/branch/config/py/test/testing/test_session.py (original) +++ py/branch/config/py/test/testing/test_session.py Fri Jan 19 17:48:15 2007 @@ -35,16 +35,6 @@ l = session.getitemoutcomepairs(py.test.Item.Passed) assert not l - def test_session_parsing(self): - from py.__.test.terminal.terminal import TerminalSession - from py.__.test.tkinter.reportsession import ReportSession - config = py.test.config._reparse(['--session=terminal']) - assert issubclass(config.getsessionclass(), TerminalSession) - config = py.test.config._reparse(['--session=tkinter']) - assert issubclass(config.getsessionclass(), ReportSession) - config = py.test.config._reparse(['--tkinter']) - assert issubclass(config.getsessionclass(), ReportSession) - class TestKeywordSelection: def test_select_simple(self): for keyword in ['test_one', 'est_on']: From cfbolz at codespeak.net Fri Jan 19 17:48:43 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 17:48:43 +0100 (CET) Subject: [py-svn] r37021 - py/dist/py/path/svn Message-ID: <20070119164843.950D21007D@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 17:48:41 2007 New Revision: 37021 Modified: py/dist/py/path/svn/wccommand.py Log: my svn client has yet another error message Modified: py/dist/py/path/svn/wccommand.py ============================================================================== --- py/dist/py/path/svn/wccommand.py (original) +++ py/dist/py/path/svn/wccommand.py Fri Jan 19 17:48:41 2007 @@ -94,7 +94,8 @@ if strerr.find('file not found') != -1: raise py.error.ENOENT(self) if (strerr.find('file exists') != -1 or - strerr.find('file already exists') != -1): + strerr.find('file already exists') != -1 or + strerr.find("can't create directory") != -1): raise py.error.EEXIST(self) raise return out From hpk at codespeak.net Fri Jan 19 17:49:47 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Fri, 19 Jan 2007 17:49:47 +0100 (CET) Subject: [py-svn] r37022 - py/branch/config/py/test/testing Message-ID: <20070119164947.0A79F1007D@code0.codespeak.net> Author: hpk Date: Fri Jan 19 17:49:44 2007 New Revision: 37022 Modified: py/branch/config/py/test/testing/test_config.py Log: this test is not really needed because all single bits are tested Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Fri Jan 19 17:49:44 2007 @@ -134,20 +134,6 @@ def setup_method(self, method): self.tmpdir = self.tmproot.mkdir(method.__name__) - def XXXtest_sessionclass_conftest_override(self): - self.tmpdir.join("conftest.py").write(py.code.Source(""" - from py.__.test.session import Session as orig - class Session(orig): - x = 42 - """)) - config = py.test.config._reparse([self.tmpdir]) - cls = config._getsessionclass() - assert cls.x == 42 - config.option.dist = True - config.option.startserver = True - cls = config._getsessionclass() - assert cls.x == 42 - def test_sessionname_default(self): config = py.test.config._reparse([self.tmpdir]) assert config._getsessionname() == 'TerminalSession' From arigo at codespeak.net Fri Jan 19 17:59:50 2007 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 19 Jan 2007 17:59:50 +0100 (CET) Subject: [py-svn] r37024 - py/dist/py/test Message-ID: <20070119165950.B01CF10072@code0.codespeak.net> Author: arigo Date: Fri Jan 19 17:59:48 2007 New Revision: 37024 Modified: py/dist/py/test/config.py Log: This should be a right-to-left, overridable lookup. Modified: py/dist/py/test/config.py ============================================================================== --- py/dist/py/test/config.py (original) +++ py/dist/py/test/config.py Fri Jan 19 17:59:48 2007 @@ -78,7 +78,7 @@ """ sessionname = self.option.session + 'Session' try: - return self.conftest.lget(sessionname) + return self.conftest.rget(sessionname) except KeyError: pass sessionimportpaths = self.conftest.lget('sessionimportpaths') From hpk at codespeak.net Fri Jan 19 17:59:52 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Fri, 19 Jan 2007 17:59:52 +0100 (CET) Subject: [py-svn] r37025 - in py/branch/config/py/test: . testing Message-ID: <20070119165952.19A0B10072@code0.codespeak.net> Author: hpk Date: Fri Jan 19 17:59:50 2007 New Revision: 37025 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/conftesthandle.py py/branch/config/py/test/testing/test_conftesthandle.py Log: remove lget and its last usage (which was a bit random) Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Fri Jan 19 17:59:50 2007 @@ -43,7 +43,7 @@ "can only parse cmdline args once per Config object") self._parsed = True self.conftest.setinitial(args) - self.conftest.lget('adddefaultoptions')() + self.conftest.rget('adddefaultoptions')() args = [str(x) for x in args] self._origargs = args cmdlineoption, remaining = self._parser.parse_args(args) Modified: py/branch/config/py/test/conftesthandle.py ============================================================================== --- py/branch/config/py/test/conftesthandle.py (original) +++ py/branch/config/py/test/conftesthandle.py Fri Jan 19 17:59:50 2007 @@ -51,9 +51,10 @@ # affect us by always returning a copy of the actual list return clist[:] - def lget(self, name, path=None): - modules = self.getconftestmodules(path) - return self._get(name, modules) + # XXX no real use case, may probably go + #def lget(self, name, path=None): + # modules = self.getconftestmodules(path) + # return self._get(name, modules) def rget(self, name, path=None): modules = self.getconftestmodules(path) Modified: py/branch/config/py/test/testing/test_conftesthandle.py ============================================================================== --- py/branch/config/py/test/testing/test_conftesthandle.py (original) +++ py/branch/config/py/test/testing/test_conftesthandle.py Fri Jan 19 17:59:50 2007 @@ -25,40 +25,40 @@ def test_default_Module_setting_is_visible_always(self): for path in self.basedir.parts(): conftest = Conftest(path) - assert conftest.lget("Module") == py.test.collect.Module + #assert conftest.lget("Module") == py.test.collect.Module assert conftest.rget("Module") == py.test.collect.Module def test_default_has_lower_prio(self): conftest = Conftest(self.basedir.join("adir")) assert conftest.rget('Directory') == 3 - assert conftest.lget('Directory') == py.test.collect.Directory + #assert conftest.lget('Directory') == py.test.collect.Directory def test_value_access_not_existing(self): conftest = Conftest(self.basedir) py.test.raises(KeyError, "conftest.rget('a')") - py.test.raises(KeyError, "conftest.lget('a')") + #py.test.raises(KeyError, "conftest.lget('a')") def test_value_access_by_path(self): conftest = Conftest(self.basedir) assert conftest.rget("a", self.basedir.join('adir')) == 1 - assert conftest.lget("a", self.basedir.join('adir')) == 1 + #assert conftest.lget("a", self.basedir.join('adir')) == 1 assert conftest.rget("a", self.basedir.join('adir', 'b')) == 1.5 - assert conftest.lget("a", self.basedir.join('adir', 'b')) == 1 - assert conftest.lget("b", self.basedir.join('adir', 'b')) == 2 - assert py.test.raises(KeyError, - 'conftest.lget("b", self.basedir.join("a"))' - ) + #assert conftest.lget("a", self.basedir.join('adir', 'b')) == 1 + #assert conftest.lget("b", self.basedir.join('adir', 'b')) == 2 + #assert py.test.raises(KeyError, + # 'conftest.lget("b", self.basedir.join("a"))' + #) def test_value_access_with_init_one_conftest(self): conftest = Conftest(self.basedir.join('adir')) assert conftest.rget("a") == 1 - assert conftest.lget("a") == 1 + #assert conftest.lget("a") == 1 def test_value_access_with_init_two_conftests(self): conftest = Conftest(self.basedir.join("adir", "b")) conftest.rget("a") == 1.5 - conftest.lget("a") == 1 - conftest.lget("b") == 1 + #conftest.lget("a") == 1 + #conftest.lget("b") == 1 class TestConftestValueAccessInPackage(TestConftestValueAccessGlobal): def setup_class(cls): From fijal at codespeak.net Fri Jan 19 18:32:35 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 18:32:35 +0100 (CET) Subject: [py-svn] r37027 - py/branch/config/py/misc Message-ID: <20070119173235.5460010077@code0.codespeak.net> Author: fijal Date: Fri Jan 19 18:32:33 2007 New Revision: 37027 Modified: py/branch/config/py/misc/terminal_helper.py Log: Add a bit more complicated terminal width guesser (any clue how to test it???) Modified: py/branch/config/py/misc/terminal_helper.py ============================================================================== --- py/branch/config/py/misc/terminal_helper.py (original) +++ py/branch/config/py/misc/terminal_helper.py Fri Jan 19 18:32:33 2007 @@ -1,6 +1,19 @@ import sys, os -terminal_width = int(os.environ.get('COLUMNS', 80))-1 +def get_terminal_width(): + try: + import termios,fcntl,struct + call = fcntl.ioctl(0,termios.TIOCGWINSZ,"\000"*8) + height,width = struct.unpack( "hhhh", call ) [:2] + terminal_width = width + except (SystemExit, KeyboardInterrupt), e: + raise + except: + # FALLBACK + terminal_width = int(os.environ.get('COLUMNS', 80))-1 + return terminal_width + +terminal_width = get_terminal_width() def ansi_print(text, esc, file=None, newline=True, flush=False): if file is None: From cfbolz at codespeak.net Fri Jan 19 18:33:00 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 18:33:00 +0100 (CET) Subject: [py-svn] r37028 - py/dist/py/c-extension/greenlet Message-ID: <20070119173300.8B5C810078@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 18:32:58 2007 New Revision: 37028 Modified: py/dist/py/c-extension/greenlet/greenlet.c Log: fix module names Modified: py/dist/py/c-extension/greenlet/greenlet.c ============================================================================== --- py/dist/py/c-extension/greenlet/greenlet.c (original) +++ py/dist/py/c-extension/greenlet/greenlet.c Fri Jan 19 18:32:58 2007 @@ -908,7 +908,7 @@ return; if (PyType_Ready(&PyGreen_Type) < 0) return; - PyExc_GreenletError = PyErr_NewException("greenlet.error", NULL, NULL); + PyExc_GreenletError = PyErr_NewException("py.magic.greenlet.error", NULL, NULL); if (PyExc_GreenletError == NULL) return; greenleterror_doc = PyString_FromString("internal greenlet error"); @@ -919,7 +919,7 @@ Py_DECREF(greenleterror_doc); if (error == -1) return; - PyExc_GreenletExit = PyErr_NewException("greenlet.GreenletExit", + PyExc_GreenletExit = PyErr_NewException("py.magic.greenlet.GreenletExit", NULL, NULL); if (PyExc_GreenletExit == NULL) return; From fijal at codespeak.net Fri Jan 19 18:33:28 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 18:33:28 +0100 (CET) Subject: [py-svn] r37029 - py/branch/config/py/test/terminal Message-ID: <20070119173328.EFE091007E@code0.codespeak.net> Author: fijal Date: Fri Jan 19 18:33:27 2007 New Revision: 37029 Modified: py/branch/config/py/test/terminal/out.py Log: This should work out now out-of-the-box, but must be ported to new interface, to allow dynamic adaption to terminal size changes. Modified: py/branch/config/py/test/terminal/out.py ============================================================================== --- py/branch/config/py/test/terminal/out.py (original) +++ py/branch/config/py/test/terminal/out.py Fri Jan 19 18:33:27 2007 @@ -35,17 +35,8 @@ class TerminalOut(Out): tty = True - def __init__(self, file): - super(TerminalOut, self).__init__(file) - try: - import termios,fcntl,struct - call = fcntl.ioctl(0,termios.TIOCGWINSZ,"\000"*8) - height,width = struct.unpack( "hhhh", call ) [:2] - self.fullwidth = width - except (SystemExit, KeyboardInterrupt), e: - raise - except: - pass + #def __init__(self, file): + # super(TerminalOut, self).__init__(file) def write(self, s): self.file.write(str(s)) From fijal at codespeak.net Fri Jan 19 18:43:12 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 18:43:12 +0100 (CET) Subject: [py-svn] r37030 - in py/branch/config/py/test/rsession: . testing Message-ID: <20070119174312.231E210077@code0.codespeak.net> Author: fijal Date: Fri Jan 19 18:42:52 2007 New Revision: 37030 Modified: py/branch/config/py/test/rsession/reporter.py py/branch/config/py/test/rsession/testing/test_reporter.py Log: Improve a bit rsession command line interface. I'm not sure if colors shouldn't come as an option. Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Fri Jan 19 18:42:52 2007 @@ -10,7 +10,7 @@ from py.__.test.terminal.out import getout from py.__.test.rsession import report from py.__.test.rsession import outcome -from py.__.misc.terminal_helper import ansi_print, terminal_width +from py.__.misc.terminal_helper import ansi_print, get_terminal_width import sys @@ -227,22 +227,31 @@ def report_ReceivedItemOutcome(self, event): host = event.host - itempath = " ".join(event.item.listnames()[1:]) if event.outcome.passed: - status = "PASSED " self.passed[host] += 1 - print "%10s: %s %s" %(host.hostname[:10], status, itempath) + sys.stdout.write("%10s: PASSED " % host.hostname[:10]) elif event.outcome.skipped: - status = "SKIPPED" self.skipped_tests_outcome.append(event) self.skipped[host] += 1 - print "%10s: %s %s" %(host.hostname[:10], status, itempath) + sys.stdout.write("%10s: SKIPPED " % host.hostname[:10]) else: self.failed[host] += 1 self.failed_tests_outcome.append(event) sys.stdout.write("%10s: " % host.hostname[:10]) ansi_print("FAILED", esc=(31,1), newline=False, file=sys.stdout) - print " " + itempath + sys.stdout.write(" ") + # we should have printed 20 characters to this point + itempath = ".".join(event.item.listnames()[1:-1]) + funname = event.item.listnames()[-1] + lgt = get_terminal_width() - 20 + # mark the function name, to be sure + to_display = len(itempath) + len(funname) + 1 + if to_display > lgt: + sys.stdout.write("..." + itempath[to_display-lgt+4:]) + else: + sys.stdout.write(itempath) + sys.stdout.write(" ") + ansi_print(funname, esc=32, file=sys.stdout) def report_Nodes(self, event): self.nodes = event.nodes Modified: py/branch/config/py/test/rsession/testing/test_reporter.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_reporter.py (original) +++ py/branch/config/py/test/rsession/testing/test_reporter.py Fri Jan 19 18:42:52 2007 @@ -166,11 +166,12 @@ r.report(report.HostReady(hosts[2])) out, err = cap.reset() assert not err - expected = """================= Test started, hosts: host1, host2, host3 ================== - host1: READY (still 2 to go) + expected1 = "Test started, hosts: host1, host2, host3" + expected2 = """host1: READY (still 2 to go) host2: READY (still 1 to go) host3: READY""" - assert out.find(expected) != -1 + assert out.find(expected1) != -1 + assert out.find(expected2) != -1 class TestLocalReporter(AbstractTestReporter): reporter = LocalReporter @@ -203,20 +204,20 @@ def test_report_received_item_outcome(self): #py.test.skip("XXX rewrite test to not rely on exact formatting") val = self.report_received_item_outcome() - expected = """ localhost: FAILED py test rsession testing test_slave.py funcpass - localhost: SKIPPED py test rsession testing test_slave.py funcpass - localhost: FAILED py test rsession testing test_slave.py funcpass - localhost: PASSED py test rsession testing test_slave.py funcpass + expected = """ localhost: FAILED py.test.rsession.testing.test_slave.py funcpass + localhost: SKIPPED py.test.rsession.testing.test_slave.py funcpass + localhost: FAILED py.test.rsession.testing.test_slave.py funcpass + localhost: PASSED py.test.rsession.testing.test_slave.py funcpass """ assert val.find(expected) != -1 def test_module(self): val = self._test_module() print val - expected = """ localhost: FAILED py test rsession testing test_slave.py funcpass - localhost: SKIPPED py test rsession testing test_slave.py funcpass - localhost: FAILED py test rsession testing test_slave.py funcpass - localhost: PASSED py test rsession testing test_slave.py funcpass + expected = """ localhost: FAILED py.test.rsession.testing.test_slave.py funcpass + localhost: SKIPPED py.test.rsession.testing.test_slave.py funcpass + localhost: FAILED py.test.rsession.testing.test_slave.py funcpass + localhost: PASSED py.test.rsession.testing.test_slave.py funcpass """ assert val.find(expected) != -1 From fijal at codespeak.net Fri Jan 19 18:47:14 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 18:47:14 +0100 (CET) Subject: [py-svn] r37031 - py/branch/config/py/test/terminal Message-ID: <20070119174714.E280C10077@code0.codespeak.net> Author: fijal Date: Fri Jan 19 18:47:12 2007 New Revision: 37031 Modified: py/branch/config/py/test/terminal/out.py Log: Don't change semantics if we don't have to. (this is a quick hack, I'll tackle this today's later) Modified: py/branch/config/py/test/terminal/out.py ============================================================================== --- py/branch/config/py/test/terminal/out.py (original) +++ py/branch/config/py/test/terminal/out.py Fri Jan 19 18:47:12 2007 @@ -35,8 +35,9 @@ class TerminalOut(Out): tty = True - #def __init__(self, file): - # super(TerminalOut, self).__init__(file) + def __init__(self, file): + super(TerminalOut, self).__init__(file) + self.fullwidth = terminal_helper.get_terminal_width() def write(self, s): self.file.write(str(s)) From fijal at codespeak.net Fri Jan 19 18:50:28 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 18:50:28 +0100 (CET) Subject: [py-svn] r37032 - py/branch/config/py/test/terminal Message-ID: <20070119175028.98F201007D@code0.codespeak.net> Author: fijal Date: Fri Jan 19 18:50:17 2007 New Revision: 37032 Modified: py/branch/config/py/test/terminal/out.py Log: Change the behaviour to always call get_terminal_width, this should make TerminalSession adapt to terminal size changes. Modified: py/branch/config/py/test/terminal/out.py ============================================================================== --- py/branch/config/py/test/terminal/out.py (original) +++ py/branch/config/py/test/terminal/out.py Fri Jan 19 18:50:17 2007 @@ -10,8 +10,9 @@ def __init__(self, file): self.file = py.io.dupfile(file) - def sep(self, sepchar, title=None): - fullwidth = self.fullwidth + def sep(self, sepchar, title=None, fullwidth=None): + if not fullwidth: + fullwidth = self.fullwidth # the goal is to have the line be as long as possible # under the condition that len(line) <= fullwidth if title is not None: @@ -37,7 +38,10 @@ tty = True def __init__(self, file): super(TerminalOut, self).__init__(file) - self.fullwidth = terminal_helper.get_terminal_width() + + def sep(self, sepchar, title=None): + super(TerminalOut, self).sep(sepchar, title, + terminal_helper.get_terminal_width()) def write(self, s): self.file.write(str(s)) From cfbolz at codespeak.net Fri Jan 19 18:55:49 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 18:55:49 +0100 (CET) Subject: [py-svn] r37033 - py/dist/py/test/rsession/testing Message-ID: <20070119175549.235141007D@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 18:55:47 2007 New Revision: 37033 Modified: py/dist/py/test/rsession/testing/test_webjs.py Log: do all the imports there, to skip if e.g. pypy is found, but not ctypes Modified: py/dist/py/test/rsession/testing/test_webjs.py ============================================================================== --- py/dist/py/test/rsession/testing/test_webjs.py (original) +++ py/dist/py/test/rsession/testing/test_webjs.py Fri Jan 19 18:55:47 2007 @@ -1,10 +1,17 @@ import py try: import pypy + from pypy.translator.js.modules import dom + from py.__.test.rsession.rsession import session_options + from py.__.test.rsession.rsession import session_options + from py.__.test.rsession import webjs + from py.__.test.rsession.web import exported_methods + from pypy.translator.js.tester import schedule_callbacks except ImportError: py.test.skip('PyPy not found') -from pypy.translator.js.tester import schedule_callbacks + from py.__.test.rsession import webjs + from py.__.test.rsession.web import exported_methods here = py.magic.autopath().dirpath() def setup_module(mod): From fijal at codespeak.net Fri Jan 19 18:58:15 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 19 Jan 2007 18:58:15 +0100 (CET) Subject: [py-svn] r37034 - py/branch/config/py/misc/testing Message-ID: <20070119175815.E9CFC1007E@code0.codespeak.net> Author: fijal Date: Fri Jan 19 18:58:13 2007 New Revision: 37034 Added: py/branch/config/py/misc/testing/test_terminal.py Log: Rather stupid test for get_terminal_width Added: py/branch/config/py/misc/testing/test_terminal.py ============================================================================== --- (empty file) +++ py/branch/config/py/misc/testing/test_terminal.py Fri Jan 19 18:58:13 2007 @@ -0,0 +1,21 @@ + +import os +from py.__.misc.terminal_helper import get_terminal_width + +def test_terminal_width(): + """ Dummy test for get_terminal_width + """ + assert get_terminal_width() + try: + def f(*args): + raise ValueError + import fcntl + ioctl = fcntl.ioctl + fcntl.ioctl = f + cols = os.environ.get('COLUMNS', None) + os.environ['COLUMNS'] = '42' + assert get_terminal_width() == 41 + finally: + fcntl.ioctl = ioctl + if cols: + os.environ['COLUMNS'] = cols From cfbolz at codespeak.net Fri Jan 19 19:08:21 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 19:08:21 +0100 (CET) Subject: [py-svn] r37035 - py/dist/py/apigen/source/testing Message-ID: <20070119180821.9133010082@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 19:08:19 2007 New Revision: 37035 Modified: py/dist/py/apigen/source/testing/test_html.py Log: no genexps in 2.3 Modified: py/dist/py/apigen/source/testing/test_html.py ============================================================================== --- py/dist/py/apigen/source/testing/test_html.py (original) +++ py/dist/py/apigen/source/testing/test_html.py Fri Jan 19 19:08:19 2007 @@ -77,7 +77,7 @@ if doc is None: doc = HTMLDocument() l = doc.prepare_line(line) - return ''.join(unicode(i) for i in l) + return ''.join([unicode(i) for i in l]) def test_prepare_line_basic(self): result = self.prepare_line(['see if this works']) From cfbolz at codespeak.net Fri Jan 19 22:53:47 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 22:53:47 +0100 (CET) Subject: [py-svn] r37037 - py/dist/py/apigen/tracer Message-ID: <20070119215347.367BD10071@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 22:53:45 2007 New Revision: 37037 Modified: py/dist/py/apigen/tracer/permastore.py Log: func_name is not writeable before 2.4 Modified: py/dist/py/apigen/tracer/permastore.py ============================================================================== --- py/dist/py/apigen/tracer/permastore.py (original) +++ py/dist/py/apigen/tracer/permastore.py Fri Jan 19 22:53:45 2007 @@ -1,3 +1,4 @@ +import py class DescPlaceholder(object): pass @@ -96,8 +97,10 @@ # pass for field in PermaDocStorage.function_fields: - def f(self, name, field=field): + d = {"field": field} + func_name = "get_function_%s" % (field, ) + exec py.code.Source(""" + def %s(self, name, field=field): return getattr(self.names[name], field) - func_name = 'get_function_%s' % field - f.func_name = func_name - setattr(PermaDocStorage, func_name, f) +""" % (func_name, )).compile() in d + setattr(PermaDocStorage, func_name, d[func_name]) From cfbolz at codespeak.net Fri Jan 19 22:54:50 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 22:54:50 +0100 (CET) Subject: [py-svn] r37038 - py/dist/py/rest Message-ID: <20070119215450.43D2C10071@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 22:54:49 2007 New Revision: 37038 Modified: py/dist/py/rest/latex.py Log: move docutils import into function where it is needed Modified: py/dist/py/rest/latex.py ============================================================================== --- py/dist/py/rest/latex.py (original) +++ py/dist/py/rest/latex.py Fri Jan 19 22:54:49 2007 @@ -1,6 +1,5 @@ import py -from docutils.core import publish_cmdline from py.__.process.cmdexec import ExecutionFailed font_to_package = {"times": "times", "helvetica": "times", @@ -107,6 +106,7 @@ old.chdir() def process_rest_file(restfile, stylesheet=None, debug=False, rest_options=None): + from docutils.core import publish_cmdline if not py.path.local.sysfind("pdflatex"): raise SystemExit("ERROR: pdflatex not found") old = py.path.local() From cfbolz at codespeak.net Fri Jan 19 22:56:20 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 22:56:20 +0100 (CET) Subject: [py-svn] r37039 - py/dist/py/rest/testing Message-ID: <20070119215620.AD7EB10071@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 22:56:19 2007 New Revision: 37039 Modified: py/dist/py/rest/testing/test_rst2pdf.py Log: directly check for the docutils Modified: py/dist/py/rest/testing/test_rst2pdf.py ============================================================================== --- py/dist/py/rest/testing/test_rst2pdf.py (original) +++ py/dist/py/rest/testing/test_rst2pdf.py Fri Jan 19 22:56:19 2007 @@ -1,8 +1,9 @@ from __future__ import generators import py +from py.__.rest.latex import process_configfile, process_rest_file try: - from py.__.rest.latex import process_configfile, process_rest_file + import docutils except ImportError: py.test.skip("docutils not present") From cfbolz at codespeak.net Fri Jan 19 22:59:48 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 22:59:48 +0100 (CET) Subject: [py-svn] r37040 - py/dist/py/test/rsession/testing Message-ID: <20070119215948.7FFE010072@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 22:59:47 2007 New Revision: 37040 Modified: py/dist/py/test/rsession/testing/test_rsession.py Log: 2.3 compatibility Modified: py/dist/py/test/rsession/testing/test_rsession.py ============================================================================== --- py/dist/py/test/rsession/testing/test_rsession.py (original) +++ py/dist/py/test/rsession/testing/test_rsession.py Fri Jan 19 22:59:47 2007 @@ -283,7 +283,8 @@ def test_sophisticated_parse(self): sshhosts = ['a at h1:/tmp', 'h2:tmp', 'h3'] dirs = parse_directories(sshhosts) - assert sorted(dirs.values()) == ['/tmp', 'pytestcache', 'tmp'] + assert py.magic.builtin.sorted( + dirs.values()) == ['/tmp', 'pytestcache', 'tmp'] def test_parse_multiple_hosts(self): hosts = ['h1', 'h1', 'h1:/tmp'] From cfbolz at codespeak.net Fri Jan 19 23:30:01 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 23:30:01 +0100 (CET) Subject: [py-svn] r37041 - py/dist/py/doc Message-ID: <20070119223001.13DF610070@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 23:30:00 2007 New Revision: 37041 Modified: py/dist/py/doc/TODO.txt Log: bin scripts are documented now. I also sorted the issues a bit Modified: py/dist/py/doc/TODO.txt ============================================================================== --- py/dist/py/doc/TODO.txt (original) +++ py/dist/py/doc/TODO.txt Fri Jan 19 23:30:00 2007 @@ -6,7 +6,7 @@ py/bin ----------- -* document and review py/bin scripts abit +* review py/bin scripts abit py.test py.rest py.lookup @@ -109,6 +109,7 @@ * no lines longer than 80 characters * review the pylib issue tracker + (cfbolz: done: what has a 0.8.0 or a 0.9.0 tag should be looked at again) py.test From cfbolz at codespeak.net Fri Jan 19 23:30:44 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 19 Jan 2007 23:30:44 +0100 (CET) Subject: [py-svn] r37042 - in py/dist/py/apigen: . rest rest/testing source testing tracer tracer/testing Message-ID: <20070119223044.32B0510079@code0.codespeak.net> Author: cfbolz Date: Fri Jan 19 23:30:40 2007 New Revision: 37042 Modified: py/dist/py/apigen/htmlgen.py py/dist/py/apigen/rest/genrest.py py/dist/py/apigen/rest/testing/test_rest.py py/dist/py/apigen/source/browser.py py/dist/py/apigen/testing/test_htmlgen.py py/dist/py/apigen/tracer/description.py py/dist/py/apigen/tracer/docstorage.py py/dist/py/apigen/tracer/model.py py/dist/py/apigen/tracer/testing/test_docgen.py py/dist/py/apigen/tracer/testing/test_model.py py/dist/py/apigen/tracer/testing/test_package.py Log: clear apigen of 2.4isms. works now on 2.3! Modified: py/dist/py/apigen/htmlgen.py ============================================================================== --- py/dist/py/apigen/htmlgen.py (original) +++ py/dist/py/apigen/htmlgen.py Fri Jan 19 23:30:40 2007 @@ -4,10 +4,13 @@ from py.__.apigen.source import browser as source_browser from py.__.apigen.source import html as source_html from py.__.apigen.tracer.description import is_private +from py.__.apigen.rest.genrest import split_of_last_part +sorted = py.builtin.sorted html = py.xml.html raw = py.xml.raw + class H(html): class Description(html.div): style = html.Style(margin_left='10em') @@ -201,7 +204,7 @@ indent += 1 # build sub items of dotted_name item - for item_dotted_name in sorted(item_dotted_names): + for item_dotted_name in py.builtin.sorted(item_dotted_names): itemname = item_dotted_name.split('.')[-1] if is_private(itemname): continue @@ -357,7 +360,7 @@ passed = [] methodsdata = [] for dotted_name in classes_dotted_names: - parent_dotted_name = dotted_name.rsplit('.', 1)[0] + parent_dotted_name, _ = split_of_last_part(dotted_name) try: sibling_dotted_names = namespace_tree[parent_dotted_name] except KeyError: @@ -391,8 +394,8 @@ # pointing to them anymore... passed = [] for dotted_name in method_dotted_names: - parent_dotted_name = dotted_name.rsplit('.', 1)[0] - module_dotted_name = dotted_name.rsplit('.', 2)[0] + parent_dotted_name, _ = split_of_last_part(dotted_name) + module_dotted_name, _ = split_of_last_part(parent_dotted_name) sibling_dotted_names = namespace_tree[module_dotted_name] tag = build_full_method_view(base, linker, dsa, dotted_name) nav = build_api_navigation(linker, dsa, parent_dotted_name, @@ -416,7 +419,7 @@ passed = [] for dotted_name in method_dotted_names: # XXX should we create a build_full_function_view instead? - parent_dotted_name = dotted_name.rsplit('.', 1)[0] + parent_dotted_name, _ = split_of_last_part(dotted_name) sibling_dotted_names = namespace_tree[parent_dotted_name] tag = build_full_method_view(base, linker, dsa, dotted_name) nav = build_api_navigation(linker, dsa, parent_dotted_name, Modified: py/dist/py/apigen/rest/genrest.py ============================================================================== --- py/dist/py/apigen/rest/genrest.py (original) +++ py/dist/py/apigen/rest/genrest.py Fri Jan 19 23:30:40 2007 @@ -12,6 +12,10 @@ from py.__.apigen.tracer import model from py.__.rest.transform import RestTransformer +def split_of_last_part(name): + name = name.split(".") + return ".".join(name[:-1]), name[-1] + class AbstractLinkWriter(object): """ Class implementing writing links to source code. There should exist various classes for that, different for Trac, @@ -324,7 +328,7 @@ ret = [] for name in self.dsa.get_class_names(): if '.' in name: - module, classname = name.rsplit('.', 1) + module, classname = split_of_last_part(name) if module in visited: continue visited.append(module) @@ -337,7 +341,7 @@ for name in self.dsa.get_class_names(): classname = name if '.' in name: - classmodule, classname = name.rsplit('.', 1) + classmodule, classname = split_of_last_part(name) if classmodule != module: continue elif module != '': @@ -351,7 +355,7 @@ for name in self.dsa.get_function_names(): funcname = name if '.' in name: - funcpath, funcname = name.rsplit('.', 1) + funcpath, funcname = split_of_last_part(name) if funcpath != module: continue elif module != '': Modified: py/dist/py/apigen/rest/testing/test_rest.py ============================================================================== --- py/dist/py/apigen/rest/testing/test_rest.py (original) +++ py/dist/py/apigen/rest/testing/test_rest.py Fri Jan 19 23:30:40 2007 @@ -20,6 +20,8 @@ from py.__.rest.transform import HTMLHandler # XXX: UUuuuuuuuuuuuuuuuuuuuuuuu, dangerous import +sorted = py.builtin.sorted + def _nl(s): """normalize newlines (converting to \n)""" s = s.replace('\r\n', '\n') Modified: py/dist/py/apigen/source/browser.py ============================================================================== --- py/dist/py/apigen/source/browser.py (original) +++ py/dist/py/apigen/source/browser.py Fri Jan 19 23:30:40 2007 @@ -39,7 +39,7 @@ return all def get_endline(start, lst): - l = reversed(lst) + l = lst[::-1] for i in l: if i.lineno: return i.lineno Modified: py/dist/py/apigen/testing/test_htmlgen.py ============================================================================== --- py/dist/py/apigen/testing/test_htmlgen.py (original) +++ py/dist/py/apigen/testing/test_htmlgen.py Fri Jan 19 23:30:40 2007 @@ -31,8 +31,8 @@ temp.join('dir/sub').ensure(dir=True) temp.join('dir/.hidden_dir').ensure(dir=True) dirs, files = htmlgen.source_dirs_files(temp.join('dir')) - dirnames = sorted([d.basename for d in dirs]) - filenames = sorted([f.basename for f in files]) + dirnames = py.builtin.sorted([d.basename for d in dirs]) + filenames = py.builtin.sorted([f.basename for f in files]) assert dirnames == ['sub'] assert filenames == ['file1.py', 'file3.c'] Modified: py/dist/py/apigen/tracer/description.py ============================================================================== --- py/dist/py/apigen/tracer/description.py (original) +++ py/dist/py/apigen/tracer/description.py Fri Jan 19 23:30:40 2007 @@ -8,6 +8,12 @@ MAX_CALL_SITES = 20 +try: + set +except NameError: + from sets import Set as set + + def is_private(name): return name.startswith('_') and not name.startswith('__') Modified: py/dist/py/apigen/tracer/docstorage.py ============================================================================== --- py/dist/py/apigen/tracer/docstorage.py (original) +++ py/dist/py/apigen/tracer/docstorage.py Fri Jan 19 23:30:40 2007 @@ -12,6 +12,8 @@ from py.__.apigen.tracer import model +sorted = py.builtin.sorted + class DocStorage(object): """ Class storing info about API """ Modified: py/dist/py/apigen/tracer/model.py ============================================================================== --- py/dist/py/apigen/tracer/model.py (original) +++ py/dist/py/apigen/tracer/model.py Fri Jan 19 23:30:40 2007 @@ -7,6 +7,12 @@ import types +try: + set +except NameError: + from sets import Set as set + + # __extend__ and pairtype? class SomeObject(object): typedef = types.ObjectType Modified: py/dist/py/apigen/tracer/testing/test_docgen.py ============================================================================== --- py/dist/py/apigen/tracer/testing/test_docgen.py (original) +++ py/dist/py/apigen/tracer/testing/test_docgen.py Fri Jan 19 23:30:40 2007 @@ -21,6 +21,12 @@ # sys.path.insert(0, str(data_path)) # XXX: Perma doc storage disabled a bit +try: + set +except NameError: + from sets import Set as set + +sorted = py.builtin.sorted def fun(a, b, c): "Some docstring" Modified: py/dist/py/apigen/tracer/testing/test_model.py ============================================================================== --- py/dist/py/apigen/tracer/testing/test_model.py (original) +++ py/dist/py/apigen/tracer/testing/test_model.py Fri Jan 19 23:30:40 2007 @@ -105,7 +105,7 @@ pass g = guess_type(A).unionof(guess_type(A())) - l = sorted(list(g.striter())) + l = py.builtin.sorted(list(g.striter())) assert l[4] == "AnyOf(" assert isinstance(l[0], SomeClass) assert l[3] == ", " Modified: py/dist/py/apigen/tracer/testing/test_package.py ============================================================================== --- py/dist/py/apigen/tracer/testing/test_package.py (original) +++ py/dist/py/apigen/tracer/testing/test_package.py Fri Jan 19 23:30:40 2007 @@ -24,8 +24,9 @@ def test_init(self): ds = self.ds assert len(ds.descs) == 4 - assert sorted(ds.descs.keys()) == ["notpak.notmod.notclass", "notpak.notmod.notclass.__init__", \ - "pak.mod.one", "pak.mod.two"] + assert py.builtin.sorted(ds.descs.keys()) == [ + "notpak.notmod.notclass", "notpak.notmod.notclass.__init__", + "pak.mod.one", "pak.mod.two"] def test_simple_call(self): ds = self.ds From cfbolz at codespeak.net Sat Jan 20 00:23:16 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 20 Jan 2007 00:23:16 +0100 (CET) Subject: [py-svn] r37043 - py/dist/py/c-extension/greenlet Message-ID: <20070119232316.2C30310077@code0.codespeak.net> Author: cfbolz Date: Sat Jan 20 00:23:15 2007 New Revision: 37043 Modified: py/dist/py/c-extension/greenlet/greenlet.c Log: try to make greenlets work with 2.5 (new style exceptions). armin, could you take a look? Modified: py/dist/py/c-extension/greenlet/greenlet.c ============================================================================== --- py/dist/py/c-extension/greenlet/greenlet.c (original) +++ py/dist/py/c-extension/greenlet/greenlet.c Sat Jan 20 00:23:15 2007 @@ -894,7 +894,9 @@ { PyObject* m; PyObject* greenletexit_doc; + PyObject* greenletexit_dict; PyObject* greenleterror_doc; + PyObject* greenleterror_dict; int error; char** p; _PyGreen_switchstack = g_switchstack; @@ -908,30 +910,50 @@ return; if (PyType_Ready(&PyGreen_Type) < 0) return; - PyExc_GreenletError = PyErr_NewException("py.magic.greenlet.error", NULL, NULL); - if (PyExc_GreenletError == NULL) + + greenleterror_dict = PyDict_New(); + if (greenleterror_dict == NULL) return; greenleterror_doc = PyString_FromString("internal greenlet error"); - if (greenleterror_doc == NULL) + if (greenleterror_doc == NULL) { + Py_DECREF(greenleterror_dict); return; - error = PyObject_SetAttrString( - PyExc_GreenletError, "__doc__", greenleterror_doc); + } + + error = PyDict_SetItemString(greenleterror_dict, "__doc__", greenleterror_doc); Py_DECREF(greenleterror_doc); - if (error == -1) + if (error == -1) { + Py_DECREF(greenleterror_dict); return; - PyExc_GreenletExit = PyErr_NewException("py.magic.greenlet.GreenletExit", - NULL, NULL); - if (PyExc_GreenletExit == NULL) + } + + PyExc_GreenletError = PyErr_NewException("py.magic.greenlet.error", NULL, greenleterror_dict); + Py_DECREF(greenleterror_dict); + if (PyExc_GreenletError == NULL) + return; + + greenletexit_dict = PyDict_New(); + if (greenletexit_dict == NULL) return; greenletexit_doc = PyString_FromString("greenlet.GreenletExit\n\ This special exception does not propagate to the parent greenlet; it\n\ can be used to kill a single greenlet.\n"); - if (greenletexit_doc == NULL) + if (greenletexit_doc == NULL) { + Py_DECREF(greenletexit_dict); return; - error = PyObject_SetAttrString( - PyExc_GreenletExit, "__doc__", greenletexit_doc); + } + + error = PyDict_SetItemString(greenletexit_dict, "__doc__", greenletexit_doc); Py_DECREF(greenletexit_doc); - if (error == -1) + if (error == -1) { + Py_DECREF(greenletexit_dict); + return; + } + + PyExc_GreenletExit = PyErr_NewException("py.magic.greenlet.GreenletExit", + NULL, greenletexit_dict); + Py_DECREF(greenletexit_dict); + if (PyExc_GreenletExit == NULL) return; ts_current = green_create_main(); From cfbolz at codespeak.net Sat Jan 20 00:25:44 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 20 Jan 2007 00:25:44 +0100 (CET) Subject: [py-svn] r37044 - in py/dist/py/test/rsession: . testing Message-ID: <20070119232544.6BBF810077@code0.codespeak.net> Author: cfbolz Date: Sat Jan 20 00:25:42 2007 New Revision: 37044 Modified: py/dist/py/test/rsession/testing/test_webjs.py py/dist/py/test/rsession/web.py Log: more fixes to the 2.3-pypy combination Modified: py/dist/py/test/rsession/testing/test_webjs.py ============================================================================== --- py/dist/py/test/rsession/testing/test_webjs.py (original) +++ py/dist/py/test/rsession/testing/test_webjs.py Sat Jan 20 00:25:42 2007 @@ -1,17 +1,17 @@ import py + try: import pypy from pypy.translator.js.modules import dom - from py.__.test.rsession.rsession import session_options - from py.__.test.rsession.rsession import session_options - from py.__.test.rsession import webjs - from py.__.test.rsession.web import exported_methods from pypy.translator.js.tester import schedule_callbacks -except ImportError: + from py.__.test.rsession.rsession import session_options + dom.Window # check whether dom was properly imported or is just a + # leftover in sys.modules +except (ImportError, AttributeError): py.test.skip('PyPy not found') - from py.__.test.rsession import webjs - from py.__.test.rsession.web import exported_methods +from py.__.test.rsession import webjs +from py.__.test.rsession.web import exported_methods here = py.magic.autopath().dirpath() def setup_module(mod): Modified: py/dist/py/test/rsession/web.py ============================================================================== --- py/dist/py/test/rsession/web.py (original) +++ py/dist/py/test/rsession/web.py Sat Jan 20 00:25:42 2007 @@ -37,7 +37,7 @@ commproxy.USE_MOCHIKIT = False IMPORTED_PYPY = True -except ImportError: +except (ImportError, NameError): class BasicExternal(object): pass From hpk at codespeak.net Sat Jan 20 02:24:06 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 20 Jan 2007 02:24:06 +0100 (CET) Subject: [py-svn] r37048 - py/dist/py/test/rsession/testing Message-ID: <20070120012406.32BF410077@code0.codespeak.net> Author: hpk Date: Sat Jan 20 02:24:05 2007 New Revision: 37048 Modified: py/dist/py/test/rsession/testing/test_rsession.py Log: test is not executed, but fix anyway Modified: py/dist/py/test/rsession/testing/test_rsession.py ============================================================================== --- py/dist/py/test/rsession/testing/test_rsession.py (original) +++ py/dist/py/test/rsession/testing/test_rsession.py Sat Jan 20 02:24:05 2007 @@ -283,7 +283,7 @@ def test_sophisticated_parse(self): sshhosts = ['a at h1:/tmp', 'h2:tmp', 'h3'] dirs = parse_directories(sshhosts) - assert py.magic.builtin.sorted( + assert py.builtin.sorted( dirs.values()) == ['/tmp', 'pytestcache', 'tmp'] def test_parse_multiple_hosts(self): From hpk at codespeak.net Sat Jan 20 12:52:00 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 20 Jan 2007 12:52:00 +0100 (CET) Subject: [py-svn] r37055 - in py/branch/config/py/test: . terminal testing Message-ID: <20070120115200.1CADF10078@code0.codespeak.net> Author: hpk Date: Sat Jan 20 12:51:54 2007 New Revision: 37055 Modified: py/branch/config/py/test/cmdline.py py/branch/config/py/test/config.py py/branch/config/py/test/defaultconftest.py py/branch/config/py/test/terminal/remote.py py/branch/config/py/test/testing/test_collect.py py/branch/config/py/test/testing/test_config.py py/branch/config/py/test/testing/test_session.py Log: reintroducing --session to lookup custom session objects in conftests.py there is no other way to override a session object from conftests. Modified: py/branch/config/py/test/cmdline.py ============================================================================== --- py/branch/config/py/test/cmdline.py (original) +++ py/branch/config/py/test/cmdline.py Sat Jan 20 12:51:54 2007 @@ -10,9 +10,7 @@ args = py.std.sys.argv[1:] config = py.test.config config.parse(args) - sessionclass = config.getsessionclass() - session = sessionclass(config) - + session = config.initsession() try: failures = session.main() if failures: Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Sat Jan 20 12:51:54 2007 @@ -76,23 +76,27 @@ except KeyError: return self.conftest.rget(name, path) - def getsessionclass(self): + def initsession(self): + """ return an initialized session object. """ + cls = self._getsessionclass() + session = cls(config) + #session.fixoptions() + return session + + def _getsessionclass(self): """ return Session class determined from cmdline options and looked up in initial config modules. """ - name = self._getsessionname() - return self._lookupsession(name) - - def _lookupsession(self, name): - """ return session class for the given name. """ - res = self.conftest.rget(name) - if isinstance(res, str): - mod = __import__(res, None, None, '__doc__') - res = getattr(mod, name) - return res + if self.option.session is not None: + return self.conftest.rget(self.option.session) + else: + name = self._getsessionname() + importpath = globals()[name] + mod = __import__(importpath, None, None, '__doc__') + return getattr(mod, name) def _getsessionname(self): - """ return session name as determined from options. """ + """ return default session name as determined from options. """ name = 'TerminalSession' if self.option.dist: name = 'RSession' @@ -162,6 +166,13 @@ # this is the one per-process instance of py.test configuration config = Config() +# default import paths for sessions + +TkinterSession = 'py.__.test.tkinter.reportsession' +TerminalSession = 'py.__.test.terminal.terminal' +RSession = 'py.__.test.rsession.rsession' +LSession = 'py.__.test.rsession.rsession' + # # helpers # Modified: py/branch/config/py/test/defaultconftest.py ============================================================================== --- py/branch/config/py/test/defaultconftest.py (original) +++ py/branch/config/py/test/defaultconftest.py Sat Jan 20 12:51:54 2007 @@ -10,13 +10,6 @@ additionalinfo = None -# =================================================== -# Default Sessions - -TkinterSession = 'py.__.test.tkinter.reportsession' -TerminalSession = 'py.__.test.terminal.terminal' -RSession = 'py.__.test.rsession.rsession' -LSession = 'py.__.test.rsession.rsession' # =================================================== # Distributed testing specific options @@ -73,13 +66,9 @@ Option('', '--traceconfig', action="store_true", dest="traceconfig", default=False, help="trace considerations of conftest.py files."), - Option('', '--apigen', - action="store", dest="apigen", - help="generate api documentation while testing (requires" - "argument pointing to a script)."), ) - py.test.config.addoptions('options implying subprocesses (warning: beta)', + py.test.config.addoptions('EXPERIMENTAL options implying subprocesses', Option('', '--tkinter', action="store_true", dest="tkinter", default=False, help="use tkinter test session frontend."), @@ -103,5 +92,12 @@ Option('-r', '--rest', action='store_true', dest="restreport", default=False, help="restructured text output reporting."), + Option('', '--apigen', + action="store", dest="apigen", + help="generate api documentation while testing (requires" + "argument pointing to a script)."), + Option('', '--session', + action="store", dest="session", default=None, + help="lookup sessioname in conftest.py files and use it."), ) Modified: py/branch/config/py/test/terminal/remote.py ============================================================================== --- py/branch/config/py/test/terminal/remote.py (original) +++ py/branch/config/py/test/terminal/remote.py Sat Jan 20 12:51:54 2007 @@ -64,7 +64,7 @@ else: cols = args #print "processing", cols - session = config.getsessionclass()(config) + session = config._getsessionclass()(config) session.shouldclose = channel.isclosed failures = session.main() channel.send(failures) Modified: py/branch/config/py/test/testing/test_collect.py ============================================================================== --- py/branch/config/py/test/testing/test_collect.py (original) +++ py/branch/config/py/test/testing/test_collect.py Sat Jan 20 12:51:54 2007 @@ -215,7 +215,7 @@ try: config = py.test.config._reparse([]) out = py.std.cStringIO.StringIO() - session = config.getsessionclass()(config, out) + session = config._getsessionclass()(config, out) session.main() l = session.getitemoutcomepairs(py.test.Item.Passed) assert len(l) == 2 @@ -225,7 +225,7 @@ # test that running the file directly works config = py.test.config._reparse([str(checkfile)]) out = py.std.cStringIO.StringIO() - session = config.getsessionclass()(config, out) + session = config._getsessionclass()(config, out) session.main() l = session.getitemoutcomepairs(py.test.Item.Passed) assert len(l) == 2 @@ -262,7 +262,7 @@ try: config = py.test.config._reparse([]) out = py.std.cStringIO.StringIO() - session = config.getsessionclass()(config, out) + session = config._getsessionclass()(config, out) session.main() l = session.getitemoutcomepairs(py.test.Item.Passed) assert len(l) == 1 @@ -272,7 +272,7 @@ # test that running the file directly works config = py.test.config._reparse([str(checkfile)]) out = py.std.cStringIO.StringIO() - session = config.getsessionclass()(config, out) + session = config._getsessionclass()(config, out) session.main() l = session.getitemoutcomepairs(py.test.Item.Passed) assert len(l) == 1 Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Sat Jan 20 12:51:54 2007 @@ -155,22 +155,15 @@ def test_tkintersession(self): config = py.test.config._reparse([self.tmpdir, '--tkinter']) assert config._getsessionname() == 'TkinterSession' - - def test_sessionname_lookup(self): - config = py.test.config._reparse([self.tmpdir]) - for name in 'TerminalSession LSession RSession TkinterSession'.split(): - cls = config._lookupsession(name) - assert cls.__name__ == name + config = py.test.config._reparse([self.tmpdir, '--dist']) def test_sessionname_lookup_custom(self): self.tmpdir.join("conftest.py").write(py.code.Source(""" - TerminalSession = 0 - TkinterSession = 1 - RSession = 2 - LSession = 3 + class MySession: + def __init__(self, config): + self.config = config """)) - config = py.test.config._reparse([self.tmpdir]) - assert config._lookupsession('TerminalSession') == 0 - assert config._lookupsession('TkinterSession') == 1 - assert config._lookupsession('RSession') == 2 - assert config._lookupsession('LSession') == 3 + config = py.test.config._reparse(["--session=MySession", self.tmpdir]) + session = config.initsession() + assert session.__class__.__name__ == 'MySession' + Modified: py/branch/config/py/test/testing/test_session.py ============================================================================== --- py/branch/config/py/test/testing/test_session.py (original) +++ py/branch/config/py/test/testing/test_session.py Sat Jan 20 12:51:54 2007 @@ -8,7 +8,7 @@ class TestDefaultSession: def test_simple(self): config = py.test.config._reparse([datadir/'filetest.py']) - session = config.getsessionclass()(config, py.std.sys.stdout) + session = config._getsessionclass()(config, py.std.sys.stdout) session.main() l = session.getitemoutcomepairs(py.test.Item.Failed) assert len(l) == 2 @@ -18,7 +18,7 @@ def test_simple_verbose(self): config = py.test.config._reparse([datadir/'filetest.py', '--verbose']) - session = config.getsessionclass()(config, py.std.sys.stdout) + session = config._getsessionclass()(config, py.std.sys.stdout) session.main() l = session.getitemoutcomepairs(py.test.Item.Failed) assert len(l) == 2 @@ -28,7 +28,7 @@ def test_simple_verbose_verbose(self): config = py.test.config._reparse([datadir/'filetest.py', '-v', '-v']) - session = config.getsessionclass()(config, py.std.sys.stdout) + session = config._getsessionclass()(config, py.std.sys.stdout) session.main() l = session.getitemoutcomepairs(py.test.Item.Failed) assert len(l) == 2 @@ -40,7 +40,7 @@ for keyword in ['test_one', 'est_on']: config = py.test.config._reparse([datadir/'filetest.py', '-k', keyword]) - session = config.getsessionclass()(config, py.std.sys.stdout) + session = config._getsessionclass()(config, py.std.sys.stdout) session.main() l = session.getitemoutcomepairs(py.test.Item.Failed) assert len(l) == 1 @@ -69,7 +69,7 @@ 'TestClass test_2', 'xxx TestClass test_2',): f = py.std.StringIO.StringIO() config = py.test.config._reparse([o, '-k', keyword]) - session = config.getsessionclass()(config, f) + session = config._getsessionclass()(config, f) session.main() print "keyword", repr(keyword) l = session.getitemoutcomepairs(py.test.Item.Passed) @@ -339,7 +339,7 @@ ['--exec=' + py.std.sys.executable, o]) assert config.option._remote - cls = config.getsessionclass() + cls = config._getsessionclass() out = [] # out = py.std.Queue.Queue() session = cls(config, out.append) session.main() @@ -359,7 +359,7 @@ print py.std.sys.executable config = py.test.config._reparse(['--looponfailing', str(o)]) assert config.option._remote - cls = config.getsessionclass() + cls = config._getsessionclass() out = py.std.Queue.Queue() session = cls(config, out.put) pool = py._thread.WorkerPool() From cfbolz at codespeak.net Sat Jan 20 13:11:03 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 20 Jan 2007 13:11:03 +0100 (CET) Subject: [py-svn] r37056 - in py/dist/py: . builtin builtin/testing Message-ID: <20070120121103.035EA1007E@code0.codespeak.net> Author: cfbolz Date: Sat Jan 20 13:11:01 2007 New Revision: 37056 Added: py/dist/py/builtin/set.py py/dist/py/builtin/testing/test_set.py Modified: py/dist/py/__init__.py Log: add set and frozenset to builtin Modified: py/dist/py/__init__.py ============================================================================== --- py/dist/py/__init__.py (original) +++ py/dist/py/__init__.py Sat Jan 20 13:11:01 2007 @@ -85,6 +85,8 @@ 'builtin.reversed' : ('./builtin/reversed.py', 'reversed'), 'builtin.sorted' : ('./builtin/sorted.py', 'sorted'), 'builtin.BaseException' : ('./builtin/exception.py', 'BaseException'), + 'builtin.set' : ('./builtin/set.py', 'set'), + 'builtin.frozenset' : ('./builtin/set.py', 'frozenset'), # gateways into remote contexts 'execnet.SocketGateway' : ('./execnet/register.py', 'SocketGateway'), Added: py/dist/py/builtin/set.py ============================================================================== --- (empty file) +++ py/dist/py/builtin/set.py Sat Jan 20 13:11:01 2007 @@ -0,0 +1,587 @@ +"""Classes to represent arbitrary sets (including sets of sets). + +This module implements sets using dictionaries whose values are +ignored. The usual operations (union, intersection, deletion, etc.) +are provided as both methods and operators. + +Important: sets are not sequences! While they support 'x in s', +'len(s)', and 'for x in s', none of those operations are unique for +sequences; for example, mappings support all three as well. The +characteristic operation for sequences is subscripting with small +integers: s[i], for i in range(len(s)). Sets don't support +subscripting at all. Also, sequences allow multiple occurrences and +their elements have a definite order; sets on the other hand don't +record multiple occurrences and don't remember the order of element +insertion (which is why they don't support s[i]). + +The following classes are provided: + +BaseSet -- All the operations common to both mutable and immutable + sets. This is an abstract class, not meant to be directly + instantiated. + +Set -- Mutable sets, subclass of BaseSet; not hashable. + +ImmutableSet -- Immutable sets, subclass of BaseSet; hashable. + + +_TemporarilyImmutableSet -- A wrapper around a Set, hashable, + giving the same hash value as the immutable set equivalent + would have. Do not use this class directly. + +Only hashable objects can be added to a Set. In particular, you cannot +really add a Set as an element to another Set; if you try, what is +actually added is an ImmutableSet built from it (it compares equal to +the one you tried adding). + +When you ask if `x in y' where x is a Set and y is a Set or +ImmutableSet, x is wrapped into a _TemporarilyImmutableSet z, and +what's tested is actually `z in y'. + +""" + +# Code history: +# +# - Greg V. Wilson wrote the first version, using a different approach +# to the mutable/immutable problem, and inheriting from dict. +# +# - Alex Martelli modified Greg's version to implement the current +# Set/ImmutableSet approach, and make the data an attribute. +# +# - Guido van Rossum rewrote much of the code, made some API changes, +# and cleaned up the docstrings. +# +# - Raymond Hettinger added a number of speedups and other +# improvements. + +from __future__ import generators +try: + from itertools import ifilter, ifilterfalse +except ImportError: + # Code to make the module run under Py2.2 + def ifilter(predicate, iterable): + if predicate is None: + def predicate(x): + return x + for x in iterable: + if predicate(x): + yield x + def ifilterfalse(predicate, iterable): + if predicate is None: + def predicate(x): + return x + for x in iterable: + if not predicate(x): + yield x + try: + True, False + except NameError: + True, False = (0==0, 0!=0) + +__all__ = ['BaseSet', 'Set', 'ImmutableSet'] + +class BaseSet(object): + """Common base class for mutable and immutable sets.""" + + __slots__ = ['_data'] + + # Constructor + + def __init__(self): + """This is an abstract class.""" + # Don't call this from a concrete subclass! + if self.__class__ is BaseSet: + raise TypeError, ("BaseSet is an abstract class. " + "Use Set or ImmutableSet.") + + # Standard protocols: __len__, __repr__, __str__, __iter__ + + def __len__(self): + """Return the number of elements of a set.""" + return len(self._data) + + def __repr__(self): + """Return string representation of a set. + + This looks like 'Set([])'. + """ + return self._repr() + + # __str__ is the same as __repr__ + __str__ = __repr__ + + def _repr(self, sorted=False): + elements = self._data.keys() + if sorted: + elements.sort() + return '%s(%r)' % (self.__class__.__name__, elements) + + def __iter__(self): + """Return an iterator over the elements or a set. + + This is the keys iterator for the underlying dict. + """ + return self._data.iterkeys() + + # Three-way comparison is not supported. However, because __eq__ is + # tried before __cmp__, if Set x == Set y, x.__eq__(y) returns True and + # then cmp(x, y) returns 0 (Python doesn't actually call __cmp__ in this + # case). + + def __cmp__(self, other): + raise TypeError, "can't compare sets using cmp()" + + # Equality comparisons using the underlying dicts. Mixed-type comparisons + # are allowed here, where Set == z for non-Set z always returns False, + # and Set != z always True. This allows expressions like "x in y" to + # give the expected result when y is a sequence of mixed types, not + # raising a pointless TypeError just because y contains a Set, or x is + # a Set and y contain's a non-set ("in" invokes only __eq__). + # Subtle: it would be nicer if __eq__ and __ne__ could return + # NotImplemented instead of True or False. Then the other comparand + # would get a chance to determine the result, and if the other comparand + # also returned NotImplemented then it would fall back to object address + # comparison (which would always return False for __eq__ and always + # True for __ne__). However, that doesn't work, because this type + # *also* implements __cmp__: if, e.g., __eq__ returns NotImplemented, + # Python tries __cmp__ next, and the __cmp__ here then raises TypeError. + + def __eq__(self, other): + if isinstance(other, BaseSet): + return self._data == other._data + else: + return False + + def __ne__(self, other): + if isinstance(other, BaseSet): + return self._data != other._data + else: + return True + + # Copying operations + + def copy(self): + """Return a shallow copy of a set.""" + result = self.__class__() + result._data.update(self._data) + return result + + __copy__ = copy # For the copy module + + def __deepcopy__(self, memo): + """Return a deep copy of a set; used by copy module.""" + # This pre-creates the result and inserts it in the memo + # early, in case the deep copy recurses into another reference + # to this same set. A set can't be an element of itself, but + # it can certainly contain an object that has a reference to + # itself. + from copy import deepcopy + result = self.__class__() + memo[id(self)] = result + data = result._data + value = True + for elt in self: + data[deepcopy(elt, memo)] = value + return result + + # Standard set operations: union, intersection, both differences. + # Each has an operator version (e.g. __or__, invoked with |) and a + # method version (e.g. union). + # Subtle: Each pair requires distinct code so that the outcome is + # correct when the type of other isn't suitable. For example, if + # we did "union = __or__" instead, then Set().union(3) would return + # NotImplemented instead of raising TypeError (albeit that *why* it + # raises TypeError as-is is also a bit subtle). + + def __or__(self, other): + """Return the union of two sets as a new set. + + (I.e. all elements that are in either set.) + """ + if not isinstance(other, BaseSet): + return NotImplemented + return self.union(other) + + def union(self, other): + """Return the union of two sets as a new set. + + (I.e. all elements that are in either set.) + """ + result = self.__class__(self) + result._update(other) + return result + + def __and__(self, other): + """Return the intersection of two sets as a new set. + + (I.e. all elements that are in both sets.) + """ + if not isinstance(other, BaseSet): + return NotImplemented + return self.intersection(other) + + def intersection(self, other): + """Return the intersection of two sets as a new set. + + (I.e. all elements that are in both sets.) + """ + if not isinstance(other, BaseSet): + other = Set(other) + if len(self) <= len(other): + little, big = self, other + else: + little, big = other, self + common = ifilter(big._data.has_key, little) + return self.__class__(common) + + def __xor__(self, other): + """Return the symmetric difference of two sets as a new set. + + (I.e. all elements that are in exactly one of the sets.) + """ + if not isinstance(other, BaseSet): + return NotImplemented + return self.symmetric_difference(other) + + def symmetric_difference(self, other): + """Return the symmetric difference of two sets as a new set. + + (I.e. all elements that are in exactly one of the sets.) + """ + result = self.__class__() + data = result._data + value = True + selfdata = self._data + try: + otherdata = other._data + except AttributeError: + otherdata = Set(other)._data + for elt in ifilterfalse(otherdata.has_key, selfdata): + data[elt] = value + for elt in ifilterfalse(selfdata.has_key, otherdata): + data[elt] = value + return result + + def __sub__(self, other): + """Return the difference of two sets as a new Set. + + (I.e. all elements that are in this set and not in the other.) + """ + if not isinstance(other, BaseSet): + return NotImplemented + return self.difference(other) + + def difference(self, other): + """Return the difference of two sets as a new Set. + + (I.e. all elements that are in this set and not in the other.) + """ + result = self.__class__() + data = result._data + try: + otherdata = other._data + except AttributeError: + otherdata = Set(other)._data + value = True + for elt in ifilterfalse(otherdata.has_key, self): + data[elt] = value + return result + + # Membership test + + def __contains__(self, element): + """Report whether an element is a member of a set. + + (Called in response to the expression `element in self'.) + """ + try: + return element in self._data + except TypeError: + transform = getattr(element, "__as_temporarily_immutable__", None) + if transform is None: + raise # re-raise the TypeError exception we caught + return transform() in self._data + + # Subset and superset test + + def issubset(self, other): + """Report whether another set contains this set.""" + self._binary_sanity_check(other) + if len(self) > len(other): # Fast check for obvious cases + return False + for elt in ifilterfalse(other._data.has_key, self): + return False + return True + + def issuperset(self, other): + """Report whether this set contains another set.""" + self._binary_sanity_check(other) + if len(self) < len(other): # Fast check for obvious cases + return False + for elt in ifilterfalse(self._data.has_key, other): + return False + return True + + # Inequality comparisons using the is-subset relation. + __le__ = issubset + __ge__ = issuperset + + def __lt__(self, other): + self._binary_sanity_check(other) + return len(self) < len(other) and self.issubset(other) + + def __gt__(self, other): + self._binary_sanity_check(other) + return len(self) > len(other) and self.issuperset(other) + + # Assorted helpers + + def _binary_sanity_check(self, other): + # Check that the other argument to a binary operation is also + # a set, raising a TypeError otherwise. + if not isinstance(other, BaseSet): + raise TypeError, "Binary operation only permitted between sets" + + def _compute_hash(self): + # Calculate hash code for a set by xor'ing the hash codes of + # the elements. This ensures that the hash code does not depend + # on the order in which elements are added to the set. This is + # not called __hash__ because a BaseSet should not be hashable; + # only an ImmutableSet is hashable. + result = 0 + for elt in self: + result ^= hash(elt) + return result + + def _update(self, iterable): + # The main loop for update() and the subclass __init__() methods. + data = self._data + + # Use the fast update() method when a dictionary is available. + if isinstance(iterable, BaseSet): + data.update(iterable._data) + return + + value = True + + if type(iterable) in (list, tuple, xrange): + # Optimized: we know that __iter__() and next() can't + # raise TypeError, so we can move 'try:' out of the loop. + it = iter(iterable) + while True: + try: + for element in it: + data[element] = value + return + except TypeError: + transform = getattr(element, "__as_immutable__", None) + if transform is None: + raise # re-raise the TypeError exception we caught + data[transform()] = value + else: + # Safe: only catch TypeError where intended + for element in iterable: + try: + data[element] = value + except TypeError: + transform = getattr(element, "__as_immutable__", None) + if transform is None: + raise # re-raise the TypeError exception we caught + data[transform()] = value + + +class ImmutableSet(BaseSet): + """Immutable set class.""" + + __slots__ = ['_hashcode'] + + # BaseSet + hashing + + def __init__(self, iterable=None): + """Construct an immutable set from an optional iterable.""" + self._hashcode = None + self._data = {} + if iterable is not None: + self._update(iterable) + + def __hash__(self): + if self._hashcode is None: + self._hashcode = self._compute_hash() + return self._hashcode + + def __getstate__(self): + return self._data, self._hashcode + + def __setstate__(self, state): + self._data, self._hashcode = state + +class Set(BaseSet): + """ Mutable set class.""" + + __slots__ = [] + + # BaseSet + operations requiring mutability; no hashing + + def __init__(self, iterable=None): + """Construct a set from an optional iterable.""" + self._data = {} + if iterable is not None: + self._update(iterable) + + def __getstate__(self): + # getstate's results are ignored if it is not + return self._data, + + def __setstate__(self, data): + self._data, = data + + def __hash__(self): + """A Set cannot be hashed.""" + # We inherit object.__hash__, so we must deny this explicitly + raise TypeError, "Can't hash a Set, only an ImmutableSet." + + # In-place union, intersection, differences. + # Subtle: The xyz_update() functions deliberately return None, + # as do all mutating operations on built-in container types. + # The __xyz__ spellings have to return self, though. + + def __ior__(self, other): + """Update a set with the union of itself and another.""" + self._binary_sanity_check(other) + self._data.update(other._data) + return self + + def union_update(self, other): + """Update a set with the union of itself and another.""" + self._update(other) + + def __iand__(self, other): + """Update a set with the intersection of itself and another.""" + self._binary_sanity_check(other) + self._data = (self & other)._data + return self + + def intersection_update(self, other): + """Update a set with the intersection of itself and another.""" + if isinstance(other, BaseSet): + self &= other + else: + self._data = (self.intersection(other))._data + + def __ixor__(self, other): + """Update a set with the symmetric difference of itself and another.""" + self._binary_sanity_check(other) + self.symmetric_difference_update(other) + return self + + def symmetric_difference_update(self, other): + """Update a set with the symmetric difference of itself and another.""" + data = self._data + value = True + if not isinstance(other, BaseSet): + other = Set(other) + if self is other: + self.clear() + for elt in other: + if elt in data: + del data[elt] + else: + data[elt] = value + + def __isub__(self, other): + """Remove all elements of another set from this set.""" + self._binary_sanity_check(other) + self.difference_update(other) + return self + + def difference_update(self, other): + """Remove all elements of another set from this set.""" + data = self._data + if not isinstance(other, BaseSet): + other = Set(other) + if self is other: + self.clear() + for elt in ifilter(data.has_key, other): + del data[elt] + + # Python dict-like mass mutations: update, clear + + def update(self, iterable): + """Add all values from an iterable (such as a list or file).""" + self._update(iterable) + + def clear(self): + """Remove all elements from this set.""" + self._data.clear() + + # Single-element mutations: add, remove, discard + + def add(self, element): + """Add an element to a set. + + This has no effect if the element is already present. + """ + try: + self._data[element] = True + except TypeError: + transform = getattr(element, "__as_immutable__", None) + if transform is None: + raise # re-raise the TypeError exception we caught + self._data[transform()] = True + + def remove(self, element): + """Remove an element from a set; it must be a member. + + If the element is not a member, raise a KeyError. + """ + try: + del self._data[element] + except TypeError: + transform = getattr(element, "__as_temporarily_immutable__", None) + if transform is None: + raise # re-raise the TypeError exception we caught + del self._data[transform()] + + def discard(self, element): + """Remove an element from a set if it is a member. + + If the element is not a member, do nothing. + """ + try: + self.remove(element) + except KeyError: + pass + + def pop(self): + """Remove and return an arbitrary set element.""" + return self._data.popitem()[0] + + def __as_immutable__(self): + # Return a copy of self as an immutable set + return ImmutableSet(self) + + def __as_temporarily_immutable__(self): + # Return self wrapped in a temporarily immutable set + return _TemporarilyImmutableSet(self) + + +class _TemporarilyImmutableSet(BaseSet): + # Wrap a mutable set as if it was temporarily immutable. + # This only supplies hashing and equality comparisons. + + def __init__(self, set): + self._set = set + self._data = set._data # Needed by ImmutableSet.__eq__() + + def __hash__(self): + return self._set._compute_hash() + + +try: + set, frozenset = set, frozenset +except NameError: + try: + from sets import Set as set, ImmutableSet as frozenset + except ImportError: + set = Set + frozenset = ImmutableSet Added: py/dist/py/builtin/testing/test_set.py ============================================================================== --- (empty file) +++ py/dist/py/builtin/testing/test_set.py Sat Jan 20 13:11:01 2007 @@ -0,0 +1,14 @@ +# some small tests to see whether sets are there and work + +from py.builtin import set, frozenset + +def test_simple(): + s = set([1, 2, 3, 4]) + assert s == set([3, 4, 2, 1]) + s1 = s.union(set([5, 6])) + assert 5 in s1 + assert 1 in s1 + +def test_frozenset(): + s = set([frozenset([0, 1]), frozenset([1, 0])]) + assert len(s) == 1 From cfbolz at codespeak.net Sat Jan 20 13:13:25 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 20 Jan 2007 13:13:25 +0100 (CET) Subject: [py-svn] r37057 - py/dist/py/doc Message-ID: <20070120121325.230331007E@code0.codespeak.net> Author: cfbolz Date: Sat Jan 20 13:13:22 2007 New Revision: 37057 Modified: py/dist/py/doc/misc.txt Log: mention set in docs Modified: py/dist/py/doc/misc.txt ============================================================================== --- py/dist/py/doc/misc.txt (original) +++ py/dist/py/doc/misc.txt Sat Jan 20 13:13:22 2007 @@ -203,5 +203,7 @@ * reversed * sorted * BaseException + * set and frozenset (using either the builtin, if available, or the sets + module) ``py.builtin.BaseException`` is just ``Exception`` before Python 2.5. From cfbolz at codespeak.net Sat Jan 20 13:18:28 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 20 Jan 2007 13:18:28 +0100 (CET) Subject: [py-svn] r37058 - in py/dist/py/apigen/tracer: . testing Message-ID: <20070120121828.AC72E1007E@code0.codespeak.net> Author: cfbolz Date: Sat Jan 20 13:18:23 2007 New Revision: 37058 Modified: py/dist/py/apigen/tracer/description.py py/dist/py/apigen/tracer/model.py py/dist/py/apigen/tracer/testing/test_docgen.py Log: use py.builtin.set instead of the import Modified: py/dist/py/apigen/tracer/description.py ============================================================================== --- py/dist/py/apigen/tracer/description.py (original) +++ py/dist/py/apigen/tracer/description.py Sat Jan 20 13:18:23 2007 @@ -8,11 +8,7 @@ MAX_CALL_SITES = 20 -try: - set -except NameError: - from sets import Set as set - +set = py.builtin.set def is_private(name): return name.startswith('_') and not name.startswith('__') Modified: py/dist/py/apigen/tracer/model.py ============================================================================== --- py/dist/py/apigen/tracer/model.py (original) +++ py/dist/py/apigen/tracer/model.py Sat Jan 20 13:18:23 2007 @@ -5,12 +5,10 @@ # we implement all the types which are in the types.*, naming # scheme after pypy's +import py import types -try: - set -except NameError: - from sets import Set as set +set = py.builtin.set # __extend__ and pairtype? Modified: py/dist/py/apigen/tracer/testing/test_docgen.py ============================================================================== --- py/dist/py/apigen/tracer/testing/test_docgen.py (original) +++ py/dist/py/apigen/tracer/testing/test_docgen.py Sat Jan 20 13:18:23 2007 @@ -21,12 +21,9 @@ # sys.path.insert(0, str(data_path)) # XXX: Perma doc storage disabled a bit -try: - set -except NameError: - from sets import Set as set sorted = py.builtin.sorted +set = py.builtin.set def fun(a, b, c): "Some docstring" From hpk at codespeak.net Sat Jan 20 16:29:27 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 20 Jan 2007 16:29:27 +0100 (CET) Subject: [py-svn] r37061 - in py/branch/config/py/test: . terminal testing Message-ID: <20070120152927.E80941007B@code0.codespeak.net> Author: hpk Date: Sat Jan 20 16:29:25 2007 New Revision: 37061 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/terminal/remote.py py/branch/config/py/test/terminal/terminal.py py/branch/config/py/test/testing/test_config.py py/branch/config/py/test/testing/test_session.py Log: refactoring/fixing the remote terminal approach (used for --exec and --looponfailing) to use the new configiguration. Removes lots of strange code. XXX there are still some recursive testing issues. Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Sat Jan 20 16:29:25 2007 @@ -108,6 +108,11 @@ if getattr(self.option, opt, False): name = 'LSession' break + else: + if self.option.looponfailing: + name = 'RemoteTerminalSession' + elif self.option.executable: + name = 'RemoteTerminalSession' return name def _reparse(self, args): @@ -170,6 +175,8 @@ TkinterSession = 'py.__.test.tkinter.reportsession' TerminalSession = 'py.__.test.terminal.terminal' +TerminalSession = 'py.__.test.terminal.terminal' +RemoteTerminalSession = 'py.__.test.terminal.remote' RSession = 'py.__.test.rsession.rsession' LSession = 'py.__.test.rsession.rsession' @@ -192,15 +199,15 @@ # setting a correct executable remote = False - if option.executable is not None: - remote = True - exe = py.path.local(py.std.os.path.expanduser(option.executable)) - if not exe.check(): - exe = py.path.local.sysfind(option.executable) - assert exe.check() - option.executable = exe - else: - option.executable = py.std.sys.executable + #if option.executable is not None: + # remote = True + # exe = py.path.local(py.std.os.path.expanduser(option.executable)) + # if not exe.check(): + # exe = py.path.local.sysfind(option.executable) + # assert exe.check() + # option.executable = exe + #else: + # option.executable = py.std.sys.executable if option.usepdb: if not option.nocapture: Modified: py/branch/config/py/test/terminal/remote.py ============================================================================== --- py/branch/config/py/test/terminal/remote.py (original) +++ py/branch/config/py/test/terminal/remote.py Sat Jan 20 16:29:25 2007 @@ -29,46 +29,6 @@ changed = True return changed -class FailingCollector(py.test.collect.Collector): - def __init__(self, faileditems): - self._faileditems = faileditems - - def __iter__(self): - for x in self._faileditems: - yield x - -def waitfinish(channel): - try: - while 1: - try: - channel.waitclose(0.1) - except (IOError, py.error.Error): - continue - else: - return channel.receive() - finally: - #print "closing down channel and gateway" - channel.gateway.exit() - -def failure_slave(channel): - """ we run this on the other side. """ - args, failures = channel.receive() - config = py.test.config._reparse(args) - # making this session definitely non-remote - config.option.executable = py.std.sys.executable - config.option.looponfailing = False - config.option._remote = False - config.option._fromremote = True - if failures: - cols = getfailureitems(failures) - else: - cols = args - #print "processing", cols - session = config._getsessionclass()(config) - session.shouldclose = channel.isclosed - failures = session.main() - channel.send(failures) - def getfailureitems(failures): l = [] for rootpath, names in failures: @@ -91,15 +51,6 @@ l.append(current) return l -def failure_master(executable, out, args, failures): - gw = py.execnet.PopenGateway(executable) - channel = gw.remote_exec(""" - from py.__.test.terminal.remote import failure_slave - failure_slave(channel) - """, stdout=out, stderr=out) - channel.send((args, failures)) - return waitfinish(channel) - def generalize(p1, p2): general = p1 for x, y in zip(p1.parts(), p2.parts()): @@ -118,34 +69,80 @@ p = p.dirpath() return p -def main(config, file, args): - """ testing process and output happens at a remote place. """ - assert file - if hasattr(file, 'write'): - def out(data): - file.write(data) - file.flush() - else: - out = file - failures = [] - args = list(args) - rootdir = getrootdir(config.remaining) - #print "rootdir", rootdir - wasfailing = False - while 1: - if config.option.looponfailing and (failures or not wasfailing): - while not checkpyfilechange(rootdir): - py.std.time.sleep(0.4) - wasfailing = len(failures) - failures = failure_master(config.option.executable, out, args, failures) - if not config.option.looponfailing: - break - print "#" * 60 - print "# looponfailing: mode: %d failures remaining" % len(failures) - for root, names in failures: - name = "/".join(names) # XXX - print "Failure at: %r" % (name,) - print "# watching py files below %s" % rootdir - print "# ", "^" * len(str(rootdir)) - return failures +class RemoteTerminalSession(object): + def __init__(self, config, file=None): + self.config = config + self._setexecutable() + if file is None: + file = py.std.sys.stdout + self._file = file + self.out = getout(file) + + def _setexecutable(self): + name = self.config.option.executable + if name is None: + executable = py.std.sys.executable + else: + executable = py.path.local.sysfind(name) + assert executable is not None, executable + self.executable = executable + + def main(self): + rootdir = getrootdir(self.config.remaining) + wasfailing = False + failures = [] + while 1: + if self.config.option.looponfailing and (failures or not wasfailing): + while not checkpyfilechange(rootdir): + py.std.time.sleep(0.4) + wasfailing = len(failures) + failures = self.run_remote_session(failures) + if not self.config.option.looponfailing: + break + print "#" * 60 + print "# looponfailing: mode: %d failures remaining" % len(failures) + for root, names in failures: + name = "/".join(names) # XXX + print "Failure at: %r" % (name,) + print "# watching py files below %s" % rootdir + print "# ", "^" * len(str(rootdir)) + return failures + + def run_remote_session(self, failures): + print "* opening PopenGateway: ", self.executable + gw = py.execnet.PopenGateway(self.executable) + channel = gw.remote_exec(""" + from py.__.test.terminal.remote import slaverun_TerminalSession + slaverun_TerminalSession(channel) + """, stdout=self.out, stderr=self.out) + print "* triggered slave terminal session ->" + repr = self.config.make_repr(conftestnames=[]) + args = self.config.remaining + channel.send((repr, args, failures)) + print "* send start info" + ack = channel.receive() + assert ack is None + failures = channel.receive() + channel.waitclose(0.1) + return failures + +def slaverun_TerminalSession(channel): + """ we run this on the other side. """ + repr, args, failures = channel.receive() + config = py.test.config + config.remaining = args + config.conftest.setinitial(args) + config.merge_repr(repr) + config.option.looponfailing = False + config.option.usepdb = False + config.option.executable = None + if failures: + cols = getfailureitems(failures) + else: + cols = args + session = config.initsession() + session.shouldclose = channel.isclosed + channel.send(None) + failures = session.main() + channel.send(failures) Modified: py/branch/config/py/test/terminal/terminal.py ============================================================================== --- py/branch/config/py/test/terminal/terminal.py (original) +++ py/branch/config/py/test/terminal/terminal.py Sat Jan 20 16:29:25 2007 @@ -25,16 +25,8 @@ file = py.std.sys.stdout self._file = file self.out = getout(file) - self._started = {} self._opencollectors = [] - def main(self): - if self.config.option._remote: - from py.__.test.terminal import remote - return remote.main(self.config, self._file, self.config._origargs) - else: - return super(TerminalSession, self).main() - # --------------------- # PROGRESS information # --------------------- @@ -128,10 +120,10 @@ for name in 'looponfailing', 'exitfirst', 'nomagic': if getattr(option, name): modes.append(name) - if option._fromremote: - modes.insert(0, 'child process') - else: - modes.insert(0, 'inprocess') + #if self._isremoteoption._fromremote: + # modes.insert(0, 'child process') + #else: + # modes.insert(0, 'inprocess') mode = "/".join(modes) self.out.line("testing-mode: %s" % mode) self.out.line("executable: %s (%s)" % Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Sat Jan 20 16:29:25 2007 @@ -152,6 +152,14 @@ config = py.test.config._reparse([self.tmpdir, '--dist', '--%s' % x]) assert config._getsessionname() == 'RSession' + def test_implied_remote_terminal_session(self): + config = py.test.config._reparse([self.tmpdir, '--looponfailing']) + assert config._getsessionname() == 'RemoteTerminalSession' + config = py.test.config._reparse([self.tmpdir, '--exec=x']) + assert config._getsessionname() == 'RemoteTerminalSession' + config = py.test.config._reparse([self.tmpdir, '--dist', '--exec=x']) + assert config._getsessionname() == 'RSession' + def test_tkintersession(self): config = py.test.config._reparse([self.tmpdir, '--tkinter']) assert config._getsessionname() == 'TkinterSession' Modified: py/branch/config/py/test/testing/test_session.py ============================================================================== --- py/branch/config/py/test/testing/test_session.py (original) +++ py/branch/config/py/test/testing/test_session.py Sat Jan 20 16:29:25 2007 @@ -328,6 +328,7 @@ assert rootdir == one.dirpath() def test_exec(self): + py.test.skip("xxx work in progress") o = tmpdir.ensure('remote', dir=1) tfile = o.join('test_exec.py') tfile.write(py.code.Source(""" @@ -338,7 +339,6 @@ config = py.test.config._reparse( ['--exec=' + py.std.sys.executable, o]) - assert config.option._remote cls = config._getsessionclass() out = [] # out = py.std.Queue.Queue() session = cls(config, out.append) @@ -350,6 +350,7 @@ py.test.fail("did not see test_1 failure") def test_looponfailing(self): + py.test.skip("xxx work in progress") o = tmpdir.ensure('looponfailing', dir=1) tfile = o.join('test_looponfailing.py') tfile.write(py.code.Source(""" From arigo at codespeak.net Sat Jan 20 17:00:33 2007 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 20 Jan 2007 17:00:33 +0100 (CET) Subject: [py-svn] r37063 - py/branch/config/py/test/rsession Message-ID: <20070120160033.427F41007B@code0.codespeak.net> Author: arigo Date: Sat Jan 20 17:00:31 2007 New Revision: 37063 Modified: py/branch/config/py/test/rsession/rsession.py Log: webbrowser.open() may block until the browser finishes or not, so better start it from a background thread. An case where it blocks is if you define the $BROWSER environment variable. Modified: py/branch/config/py/test/rsession/rsession.py ============================================================================== --- py/branch/config/py/test/rsession/rsession.py (original) +++ py/branch/config/py/test/rsession/rsession.py Sat Jan 20 17:00:31 2007 @@ -61,8 +61,10 @@ reporter = exported_methods.report start_server() if self.config.option.runbrowser: - import webbrowser - webbrowser.open("http://localhost:8000") + import webbrowser, thread + # webbrowser.open() may block until the browser finishes or not + url = "http://localhost:8000" + thread.start_new_thread(webbrowser.open, (url,)) elif reporter is None: if restflag: from py.__.test.rsession.rest import RestReporter From arigo at codespeak.net Sat Jan 20 17:15:12 2007 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 20 Jan 2007 17:15:12 +0100 (CET) Subject: [py-svn] r37065 - in py/branch/config/py/test: . rsession Message-ID: <20070120161512.352DE1007B@code0.codespeak.net> Author: arigo Date: Sat Jan 20 17:15:10 2007 New Revision: 37065 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/rsession/rsession.py py/branch/config/py/test/rsession/web.py Log: Choose a random free port when using the --runbrowser option, but stick to the fixed 8000 when using --startserver only. Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Sat Jan 20 17:15:10 2007 @@ -219,6 +219,6 @@ option._fromremote = False if option.runbrowser and not option.startserver: - print "Cannot point browser when not starting server" + #print "Cannot point browser when not starting server" option.startserver = True # XXX: Shouldn't we fix the session here? Modified: py/branch/config/py/test/rsession/rsession.py ============================================================================== --- py/branch/config/py/test/rsession/rsession.py (original) +++ py/branch/config/py/test/rsession/rsession.py Sat Jan 20 17:15:10 2007 @@ -57,13 +57,19 @@ if startserverflag and reporter is None: from py.__.test.rsession.web import start_server, exported_methods + if self.config.option.runbrowser: + from socket import INADDR_ANY + port = INADDR_ANY # pick a random port when starting browser + else: + port = 8000 # stick to a fixed port otherwise reporter = exported_methods.report - start_server() + httpd = start_server(server_address = ('', port)) + port = httpd.server_port if self.config.option.runbrowser: import webbrowser, thread # webbrowser.open() may block until the browser finishes or not - url = "http://localhost:8000" + url = "http://localhost:%d" % (port,) thread.start_new_thread(webbrowser.open, (url,)) elif reporter is None: if restflag: Modified: py/branch/config/py/test/rsession/web.py ============================================================================== --- py/branch/config/py/test/rsession/web.py (original) +++ py/branch/config/py/test/rsession/web.py Sat Jan 20 17:15:10 2007 @@ -416,10 +416,10 @@ if start_new: thread.start_new_thread(httpd.serve_forever, ()) - print "Server started, listening on %s" % (server_address,) + print "Server started, listening on port %d" % (httpd.server_port,) return httpd else: - print "Server started, listening on %s" % (server_address,) + print "Server started, listening on port %d" % (httpd.server_port,) httpd.serve_forever() def kill_server(): From guido at codespeak.net Sat Jan 20 17:37:40 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 20 Jan 2007 17:37:40 +0100 (CET) Subject: [py-svn] r37066 - in py/dist/py/apigen: . testing Message-ID: <20070120163740.764581007E@code0.codespeak.net> Author: guido Date: Sat Jan 20 17:37:38 2007 New Revision: 37066 Modified: py/dist/py/apigen/htmlgen.py py/dist/py/apigen/testing/test_apigen_example.py Log: Fixed stylesheet links. Modified: py/dist/py/apigen/htmlgen.py ============================================================================== --- py/dist/py/apigen/htmlgen.py (original) +++ py/dist/py/apigen/htmlgen.py Sat Jan 20 17:37:38 2007 @@ -5,6 +5,7 @@ from py.__.apigen.source import html as source_html from py.__.apigen.tracer.description import is_private from py.__.apigen.rest.genrest import split_of_last_part +from py.__.apigen.linker import relpath sorted = py.builtin.sorted html = py.xml.html @@ -234,7 +235,7 @@ if child.ext in ['.pyc', '.pyo']: continue files.append(child) - return dirs, files + return sorted(dirs), sorted(files) def build_source_navigation(linker, projroot, fspath, outputpath): nav = H.Navigation() @@ -264,10 +265,10 @@ # we're a file, build our parent's children only dirpath = fspath.dirpath() diritems, fileitems = source_dirs_files(dirpath) - for dir in sorted(diritems): + for dir in diritems: nav.append(build_navitem_html(linker, dir.basename, dir.strpath, indent, False)) - for file in sorted(fileitems): + for file in fileitems: selected = (fspath.check(file=True) and file.basename == fspath.basename) nav.append(build_navitem_html(linker, file.basename, file.strpath, @@ -316,7 +317,9 @@ # skip hidden dirs and files continue elif fspath.check(dir=True): - reloutputpath = 'source/%s/index.html' % (relfspath,) + if relfspath != '': + relfspath += '/' + reloutputpath = 'source/%sindex.html' % (relfspath,) else: reloutputpath = "source/%s.html" % (relfspath,) outputpath = outputbase.join(reloutputpath) @@ -348,8 +351,10 @@ else: tag, nav = build_source_nonpython_page(linker, projroot, fspath, outputpath) + stylesheeturl = relpath('%s/' % (outputpath.dirpath(),), + '%s' % (outputbase.join('style.css'),)) page = wrap_page(project, 'sources for %s' % (fspath.basename,), - tag, nav, outputbase) + tag, nav, outputbase, stylesheeturl) outputpath.ensure() reltargetpath = outputpath.relto(outputbase) content = linker.call_withbase(reltargetpath, page.unicode) @@ -382,10 +387,12 @@ def build_class_api_pages(linker, data, project, outputbase): """ build the full api pages for a set of classes """ for dotted_name, tag, nav, reltargetpath in data: + targetpath = outputbase.ensure(reltargetpath) + stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), + outputbase.join('style.css').strpath) page = wrap_page(project, 'api documentation for %s' % (dotted_name,), - tag, nav, outputbase) + tag, nav, outputbase, stylesheeturl) content = linker.call_withbase(reltargetpath, page.unicode) - targetpath = outputbase.ensure(reltargetpath) targetpath.write(content.encode("utf8")) def prepare_method_api_pages(linker, dsa, base, namespace_tree, @@ -407,10 +414,12 @@ def build_method_api_pages(linker, data, project, outputbase): for dotted_name, tag, nav, reltargetpath in data: + targetpath = outputbase.join(reltargetpath) + stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), + outputbase.join('style.css').strpath) page = wrap_page(project, 'api documentation for %s' % (dotted_name,), - tag, nav, outputbase) + tag, nav, outputbase, stylesheeturl) content = linker.call_withbase(reltargetpath, page.unicode) - targetpath = outputbase.join(reltargetpath) targetpath.ensure() targetpath.write(content.encode("utf8")) @@ -431,10 +440,12 @@ def build_function_api_pages(linker, data, project, outputbase): for dotted_name, tag, nav, reltargetpath in data: + targetpath = outputbase.join(reltargetpath) + stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), + outputbase.join('style.css').strpath) page = wrap_page(project, 'api documentation for %s' % (dotted_name,), - tag, nav, outputbase) + tag, nav, outputbase, stylesheeturl) content = linker.call_withbase(reltargetpath, page.unicode) - targetpath = outputbase.join(reltargetpath) targetpath.ensure() targetpath.write(content.encode("utf8")) @@ -462,16 +473,18 @@ for dotted_name, tag, nav, reltargetpath in data: if dotted_name == '': dotted_name = 'project root' + targetpath = outputbase.join(reltargetpath) + stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), + outputbase.join('style.css').strpath) page = wrap_page(project, 'index of %s namespace' % (dotted_name,), - tag, nav, outputbase) + tag, nav, outputbase, stylesheeturl) content = linker.call_withbase(reltargetpath, page.unicode) - targetpath = outputbase.join(reltargetpath) targetpath.ensure() targetpath.write(content.encode("utf8")) -def wrap_page(project, title, contentel, navel, outputpath): +def wrap_page(project, title, contentel, navel, outputpath, stylesheeturl): page = LayoutPage(project, title, nav=navel, encoding='UTF-8', - stylesheeturl='style.css',) + stylesheeturl=stylesheeturl) page.set_content(contentel) here = py.magic.autopath().dirpath() style = here.join('style.css').read() Modified: py/dist/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_example.py (original) +++ py/dist/py/apigen/testing/test_apigen_example.py Sat Jan 20 17:37:38 2007 @@ -139,6 +139,7 @@ print html # note that the root and the first level both have the same name (pkg) # in our example project (XXX fixme!!) + assert 'href="../style.css"' in html assert 'href="index.html">pkg' in html assert 'href="pkg.html">pkg' in html assert 'href="pkg.SomeClass.html">SomeClass' in html @@ -160,6 +161,8 @@ clsfile = base.join('api/pkg.SomeSubClass.html') assert clsfile.check() html = clsfile.read() + print html + assert 'href="../style.css"' in html assert 'href="pkg.SomeClass.html">pkg.SomeClass' in html _checkhtml(html) @@ -178,7 +181,8 @@ assert funcsource.check(file=True) html = funcsource.read() print html - #assert 'py' in html + assert 'href="../../style.css"' in html + assert 'root' in html assert 'pkg' in html assert 'someclass.py' in html assert 'somesubclass.py' in html @@ -315,8 +319,7 @@ self.fs_root.join('pkg'), base) html = nav.unicode(indent=0) print html.encode('UTF-8') - # XXX fix the double slash!! - assert 'href="source//index.html">root' in html + assert 'href="source/index.html">root' in html assert 'href="source/pkg/index.html">pkg' in html assert 'href="source/pkg/func.py.html">func.py' in html assert 'href="source/pkg/someclass.py.html">someclass.py' in html From hpk at codespeak.net Sat Jan 20 21:43:55 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 20 Jan 2007 21:43:55 +0100 (CET) Subject: [py-svn] r37074 - in py/branch/config/py: . doc doc/example/pytest test test/terminal test/testing test/tkinter Message-ID: <20070120204355.A06101007E@code0.codespeak.net> Author: hpk Date: Sat Jan 20 21:43:52 2007 New Revision: 37074 Modified: py/branch/config/py/__init__.py py/branch/config/py/doc/example/pytest/test_failures.py py/branch/config/py/doc/test_conftest.py py/branch/config/py/test/collect.py py/branch/config/py/test/config.py py/branch/config/py/test/item.py py/branch/config/py/test/session.py py/branch/config/py/test/terminal/remote.py py/branch/config/py/test/testing/test_collect.py py/branch/config/py/test/testing/test_config.py py/branch/config/py/test/testing/test_doctest.py py/branch/config/py/test/testing/test_session.py py/branch/config/py/test/tkinter/backend.py Log: * config.initsession() deals with getting at a session class and initiliazing it * config._getcollector(path) gets a collector pointing to path * added lots of tests * thus remove the strange getfscollector and map2colitems logic * mark some tkinter tests as skipped * fixing things all around Modified: py/branch/config/py/__init__.py ============================================================================== --- py/branch/config/py/__init__.py (original) +++ py/branch/config/py/__init__.py Sat Jan 20 21:43:52 2007 @@ -32,7 +32,7 @@ 'test.compat.TestCase' : ('./test/compat.py', 'TestCase'), # configuration/initialization related test api - 'test.config' : ('./test/config.py', 'config'), + 'test.config' : ('./test/config.py', 'config_per_process'), 'test.ensuretemp' : ('./test/config.py', 'ensuretemp'), 'test.cmdline.main' : ('./test/cmdline.py', 'main'), Modified: py/branch/config/py/doc/example/pytest/test_failures.py ============================================================================== --- py/branch/config/py/doc/example/pytest/test_failures.py (original) +++ py/branch/config/py/doc/example/pytest/test_failures.py Sat Jan 20 21:43:52 2007 @@ -4,7 +4,7 @@ def test_failure_demo_fails_properly(): config = py.test.config._reparse([failure_demo]) - session = config.getsessionclass()(config, py.std.sys.stdout) + session = config.initsession() session.main() l = session.getitemoutcomepairs(py.test.Item.Failed) assert len(l) == 21 Modified: py/branch/config/py/doc/test_conftest.py ============================================================================== --- py/branch/config/py/doc/test_conftest.py (original) +++ py/branch/config/py/doc/test_conftest.py Sat Jan 20 21:43:52 2007 @@ -7,7 +7,6 @@ def test_doctest_basic(): # XXX get rid of the next line: py.magic.autopath().dirpath('conftest.py').copy(tmpdir.join('conftest.py')) - tmpdir.ensure('__init__.py') xtxt = tmpdir.join('x.txt') xtxt.write(py.code.Source(""" @@ -29,7 +28,7 @@ end """)) config = py.test.config._reparse([xtxt]) - session = config.getsessionclass()(config, py.std.sys.stdout) + session = config.initsession() session.main() l = session.getitemoutcomepairs(py.test.Item.Failed) assert len(l) == 0 @@ -47,7 +46,7 @@ .. _`blah`: javascript:some_function() """)) config = py.test.config._reparse([xtxt]) - session = config.getsessionclass()(config, py.std.sys.stdout) + session = config.initsession() session.main() l = session.getitemoutcomepairs(py.test.Item.Failed) assert len(l) == 0 Modified: py/branch/config/py/test/collect.py ============================================================================== --- py/branch/config/py/test/collect.py (original) +++ py/branch/config/py/test/collect.py Sat Jan 20 21:43:52 2007 @@ -29,31 +29,9 @@ def configproperty(name): def fget(self): #print "retrieving %r property from %s" %(name, self.fspath) - return py.test.config.getvalue(name, self.fspath) + return self.config.getvalue(name, self.fspath) return property(fget) -def getfscollector(fspath): - if isinstance(fspath, str): - fspath = py.path.local(fspath) - if not fspath.check(): - raise py.error.ENOENT(fspath) - pkgpath = fspath.pypkgpath() - if pkgpath is None: - if fspath.check(dir=1): - pkgpath = fspath - else: - pkgpath = fspath.dirpath() - Directory = py.test.config.getvalue('Directory', pkgpath) - current = Directory(pkgpath) - #print "pkgpath", pkgpath - names = filter(None, fspath.relto(pkgpath).split(fspath.sep)) - for name in names: - current = current.join(name) - assert current, "joining %r resulted in None!" % (names,) - top = current.listchain()[0] - #top._config = config - return current - class Collector(object): """ Collector instances are iteratively generated (through their run() and join() methods) @@ -63,10 +41,10 @@ (or None if it is the root collector) name: basename of this collector object """ - def __init__(self, name, parent=None): + def __init__(self, name, parent=None): self.name = name self.parent = parent - self.option = getattr(parent, 'option', None) + self.config = getattr(parent, 'config', py.test.config) self.fspath = getattr(parent, 'fspath', None) Module = configproperty('Module') @@ -391,7 +369,7 @@ return res def startcapture(self): - if not self.option.nocapture: + if not self.config.option.nocapture: assert not hasattr(self, '_capture') #self._capture = py.io.OutErrCapture() # XXX integrate this into py.io / refactor Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Sat Jan 20 21:43:52 2007 @@ -45,7 +45,6 @@ self.conftest.setinitial(args) self.conftest.rget('adddefaultoptions')() args = [str(x) for x in args] - self._origargs = args cmdlineoption, remaining = self._parser.parse_args(args) self.option.__dict__.update(vars(cmdlineoption)) fixoptions(self.option) # XXX fixing should be moved to sessions @@ -53,6 +52,31 @@ remaining.append(py.std.os.getcwd()) self.remaining = remaining + def getcolitems(self): + """ return initial collectors. """ + colitems = [] + if self.remaining: + for path in self.remaining: + path = py.path.local(path) + colitems.append(self._getcollector(path)) + return colitems + + def _getcollector(self, path): + assert path.check(), "%s: path does not exist" %(path,) + pkgpath = path.pypkgpath() + if pkgpath is None: + pkgpath = path.check(file=1) and path.dirpath() or path + print pkgpath + col = self.conftest.rget("Directory", pkgpath)(pkgpath) + col.config = self + for name in path.relto(pkgpath).split(path.sep): + if name: + print "joining", name, "to", col + col = col.join(name) + assert col is not None, ( + "joining %r to collector %s resulted in None" %(name, col)) + return col + def addoptions(self, groupname, *specs): """ add a named group of options to the current testing session. This function gets invoked during testing session initialization. @@ -79,7 +103,7 @@ def initsession(self): """ return an initialized session object. """ cls = self._getsessionclass() - session = cls(config) + session = cls(self) #session.fixoptions() return session @@ -117,14 +141,14 @@ def _reparse(self, args): """ this is used from tests that want to re-invoke parse(). """ - global config + global config_per_process oldconfig = py.test.config try: - config = py.test.config = Config() - config.parse(args) - return config + config_per_process = py.test.config = Config() + config_per_process.parse(args) + return config_per_process finally: - config = py.test.config = oldconfig + config_per_process = py.test.config = oldconfig def _overwrite(self, name, value): """ this is used from tests to overwrite values irrespectives of conftests. @@ -169,7 +193,7 @@ setattr(self.option, name, val) # this is the one per-process instance of py.test configuration -config = Config() +config_per_process = Config() # default import paths for sessions Modified: py/branch/config/py/test/item.py ============================================================================== --- py/branch/config/py/test/item.py (original) +++ py/branch/config/py/test/item.py Sat Jan 20 21:43:52 2007 @@ -31,7 +31,7 @@ class Item(py.test.collect.Collector): def startcapture(self): - if not self.option.nocapture: + if not self.config.option.nocapture: # XXX refactor integrate capturing #self._capture = py.io.OutErrCapture() from py.__.misc.simplecapture import SimpleOutErrCapture Modified: py/branch/config/py/test/session.py ============================================================================== --- py/branch/config/py/test/session.py (original) +++ py/branch/config/py/test/session.py Sat Jan 20 21:43:52 2007 @@ -38,7 +38,7 @@ def main(self): """ main loop for running tests. """ - colitems = self._map2colitems(self.config.remaining) + colitems = self.config.getcolitems() try: self.header(colitems) try: @@ -128,21 +128,6 @@ return True return False - - def _map2colitems(items): - # first convert all path objects into collectors - from py.__.test.collect import getfscollector - colitems = [] - for item in items: - if isinstance(item, (list, tuple)): - colitems.extend(Session._map2colitems(item)) - elif not isinstance(item, py.test.collect.Collector): - colitems.append(getfscollector(item)) - else: - colitems.append(item) - return colitems - _map2colitems = staticmethod(_map2colitems) - class Exit(Exception): """ for immediate program exits without tracebacks and reporter/summary. """ def __init__(self, msg="unknown reason", item=None): Modified: py/branch/config/py/test/terminal/remote.py ============================================================================== --- py/branch/config/py/test/terminal/remote.py (original) +++ py/branch/config/py/test/terminal/remote.py Sat Jan 20 21:43:52 2007 @@ -115,20 +115,21 @@ from py.__.test.terminal.remote import slaverun_TerminalSession slaverun_TerminalSession(channel) """, stdout=self.out, stderr=self.out) - print "* triggered slave terminal session ->" + print "MASTER: triggered slave terminal session ->" repr = self.config.make_repr(conftestnames=[]) - args = self.config.remaining - channel.send((repr, args, failures)) - print "* send start info" - ack = channel.receive() - assert ack is None - failures = channel.receive() - channel.waitclose(0.1) - return failures + channel.send((repr, self.config.remaining, failures)) + print "MASTER: send start info" + try: + return channel.receive() + except channel.RemoteError, e: + print e + return [] def slaverun_TerminalSession(channel): """ we run this on the other side. """ + print "SLAVE: starting" repr, args, failures = channel.receive() + print "SLAVE: received configuration" config = py.test.config config.remaining = args config.conftest.setinitial(args) @@ -143,6 +144,6 @@ cols = args session = config.initsession() session.shouldclose = channel.isclosed - channel.send(None) + print "SLAVE: received configuration" failures = session.main() channel.send(failures) Modified: py/branch/config/py/test/testing/test_collect.py ============================================================================== --- py/branch/config/py/test/testing/test_collect.py (original) +++ py/branch/config/py/test/testing/test_collect.py Sat Jan 20 21:43:52 2007 @@ -12,18 +12,6 @@ py.test.raises(ImportError, col.run) py.test.raises(ImportError, col.run) -def XXXtest_finds_root(): - fn = datadir / 'filetest.py' - col = py.test.collect.Module(fn) - root, namelist = col.fromroot() - assert isinstance(root, py.test.collect.Directory) - cur = root - for x in namelist: - cur = cur.join(x) - assert cur.name == col.name - assert cur.parent == col.parent - assert cur.fspath == cur.fspath - def test_collect_listnames_and_back(): col1 = py.test.collect.Directory(datadir.dirpath()) col2 = col1.join(datadir.basename) @@ -203,10 +191,10 @@ assert 23 == 23 """) - from py.__.test.collect import getfscollector for x in (o, checkfile, checkfile.dirpath()): + config = py.test.config._reparse([x]) #print "checking that %s returns custom items" % (x,) - col = getfscollector(x) + col = config._getcollector(x) assert len(list(col.tryiter(py.test.Item))) == 2 #assert items[1].__class__.__name__ == 'MyFunction' @@ -250,10 +238,10 @@ """) checkfile = o.ensure('somedir', 'moredir', 'check_something.txt') - from py.__.test.collect import getfscollector for x in (o, checkfile, checkfile.dirpath()): print "checking that %s returns custom items" % (x,) - col = getfscollector(x) + config = py.test.config._reparse([x]) + col = config._getcollector(x) assert len(list(col.tryiter(py.test.Item))) == 1 #assert items[1].__class__.__name__ == 'MyFunction' Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Sat Jan 20 21:43:52 2007 @@ -132,7 +132,7 @@ cls.tmproot = py.test.ensuretemp(cls.__name__) def setup_method(self, method): - self.tmpdir = self.tmproot.mkdir(method.__name__) + self.tmpdir = self.tmproot.ensure(method.__name__, dir=1) def test_sessionname_default(self): config = py.test.config._reparse([self.tmpdir]) @@ -175,3 +175,80 @@ session = config.initsession() assert session.__class__.__name__ == 'MySession' + def test_initsession(self): + config = py.test.config._reparse([self.tmpdir]) + session = config.initsession() + assert session.config is config + +class TestConfigColitems: + def setup_class(cls): + cls.tmproot = py.test.ensuretemp(cls.__name__) + + def setup_method(self, method): + self.tmpdir = self.tmproot.mkdir(method.__name__) + + def test_getcolitems_onedir(self): + config = py.test.config._reparse([self.tmpdir]) + colitems = config.getcolitems() + assert len(colitems) == 1 + col = colitems[0] + assert isinstance(col, py.test.collect.Directory) + for col in col.listchain(): + assert col.config is config + + def test_getcolitems_twodirs(self): + config = py.test.config._reparse([self.tmpdir, self.tmpdir]) + colitems = config.getcolitems() + assert len(colitems) == 2 + col1, col2 = colitems + assert col1.name == col2.name + assert col1.parent == col2.parent + + def test_getcolitems_curdir_and_subdir(self): + a = self.tmpdir.ensure("a", dir=1) + config = py.test.config._reparse([self.tmpdir, a]) + colitems = config.getcolitems() + assert len(colitems) == 2 + col1, col2 = colitems + assert col1.name == self.tmpdir.basename + assert col2.name == 'a' + for col in colitems: + for subcol in col.listchain(): + assert col.config is config + + def test__getcol_global_file(self): + x = self.tmpdir.ensure("x.py") + config = py.test.config._reparse([x]) + col = config._getcollector(x) + assert isinstance(col, py.test.collect.Module) + assert col.name == 'x.py' + assert col.parent.name == self.tmpdir.basename + assert col.parent.parent is None + for col in col.listchain(): + assert col.config is config + + def test__getcol_global_dir(self): + x = self.tmpdir.ensure("a", dir=1) + config = py.test.config._reparse([x]) + col = config._getcollector(x) + assert isinstance(col, py.test.collect.Directory) + print col.listchain() + assert col.name == 'a' + assert col.parent is None + assert col.config is config + + def test__getcol_pkgfile(self): + x = self.tmpdir.ensure("x.py") + self.tmpdir.ensure("__init__.py") + config = py.test.config._reparse([x]) + col = config._getcollector(x) + assert isinstance(col, py.test.collect.Module) + assert col.name == 'x.py' + assert col.parent.name == x.dirpath().basename + assert col.parent.parent is None + for col in col.listchain(): + assert col.config is config + + + + Modified: py/branch/config/py/test/testing/test_doctest.py ============================================================================== --- py/branch/config/py/test/testing/test_doctest.py (original) +++ py/branch/config/py/test/testing/test_doctest.py Sat Jan 20 21:43:52 2007 @@ -32,10 +32,10 @@ >>> i-1 4 """)) - from py.__.test.collect import getfscollector for x in (o, checkfile): #print "checking that %s returns custom items" % (x,) - col = getfscollector(x) + config = py.test.config._reparse([x]) + col = config._getcollector(x) items = list(col.tryiter(py.test.Item)) assert len(items) == 1 assert isinstance(items[0], DoctestText) Modified: py/branch/config/py/test/testing/test_session.py ============================================================================== --- py/branch/config/py/test/testing/test_session.py (original) +++ py/branch/config/py/test/testing/test_session.py Sat Jan 20 21:43:52 2007 @@ -5,35 +5,20 @@ mod.datadir = setupdatadir() mod.tmpdir = py.test.ensuretemp(mod.__name__) -class TestDefaultSession: - def test_simple(self): - config = py.test.config._reparse([datadir/'filetest.py']) - session = config._getsessionclass()(config, py.std.sys.stdout) - session.main() - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 2 - l = session.getitemoutcomepairs(py.test.Item.Passed) - assert not l - - def test_simple_verbose(self): - config = py.test.config._reparse([datadir/'filetest.py', - '--verbose']) - session = config._getsessionclass()(config, py.std.sys.stdout) - session.main() - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 2 - l = session.getitemoutcomepairs(py.test.Item.Passed) - assert not l - - def test_simple_verbose_verbose(self): - config = py.test.config._reparse([datadir/'filetest.py', - '-v', '-v']) - session = config._getsessionclass()(config, py.std.sys.stdout) - session.main() - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 2 - l = session.getitemoutcomepairs(py.test.Item.Passed) - assert not l +def test_default_session_options(): + for opts in ([], ['-l'], ['-s'], ['--tb=no'], ['--tb=short'], + ['--tb=long'], ['--fulltrace'], ['--nomagic'], + ['--traceconfig'], ['-v'], ['-v', '-v']): + yield runfiletest, opts + +def runfiletest(opts): + config = py.test.config._reparse(opts + [datadir/'filetest.py']) + session = config.initsession() + session.main() + l = session.getitemoutcomepairs(py.test.Item.Failed) + assert len(l) == 2 + l = session.getitemoutcomepairs(py.test.Item.Passed) + assert not l class TestKeywordSelection: def test_select_simple(self): Modified: py/branch/config/py/test/tkinter/backend.py ============================================================================== --- py/branch/config/py/test/tkinter/backend.py (original) +++ py/branch/config/py/test/tkinter/backend.py Sat Jan 20 21:43:52 2007 @@ -184,6 +184,7 @@ self.queue.put(item) def start_tests(self, config = None, args = [], tests = []): + py.test.skip("XXX fix this or remove --tkinter") if self.running: return if config is None: From hpk at codespeak.net Sat Jan 20 21:51:19 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 20 Jan 2007 21:51:19 +0100 (CET) Subject: [py-svn] r37075 - py/branch/config/py/test Message-ID: <20070120205119.DC32E10069@code0.codespeak.net> Author: hpk Date: Sat Jan 20 21:51:18 2007 New Revision: 37075 Modified: py/branch/config/py/test/config.py Log: remove two debug prints Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Sat Jan 20 21:51:18 2007 @@ -66,12 +66,10 @@ pkgpath = path.pypkgpath() if pkgpath is None: pkgpath = path.check(file=1) and path.dirpath() or path - print pkgpath col = self.conftest.rget("Directory", pkgpath)(pkgpath) col.config = self for name in path.relto(pkgpath).split(path.sep): if name: - print "joining", name, "to", col col = col.join(name) assert col is not None, ( "joining %r to collector %s resulted in None" %(name, col)) From hpk at codespeak.net Sat Jan 20 22:19:44 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 20 Jan 2007 22:19:44 +0100 (CET) Subject: [py-svn] r37076 - in py/branch/config/py/test: . terminal testing Message-ID: <20070120211944.70DF810078@code0.codespeak.net> Author: hpk Date: Sat Jan 20 22:19:42 2007 New Revision: 37076 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/terminal/out.py py/branch/config/py/test/testing/test_session.py Log: unskip exec and looponfailing tests, fixes for that Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Sat Jan 20 22:19:42 2007 @@ -237,9 +237,6 @@ option.nocapture = True # make information available about wether we should/will be remote - option._remote = remote or option.looponfailing - option._fromremote = False - if option.runbrowser and not option.startserver: #print "Cannot point browser when not starting server" option.startserver = True Modified: py/branch/config/py/test/terminal/out.py ============================================================================== --- py/branch/config/py/test/terminal/out.py (original) +++ py/branch/config/py/test/terminal/out.py Sat Jan 20 22:19:42 2007 @@ -80,8 +80,10 @@ # if file is None: file = py.std.sys.stdout - elif hasattr(file, 'send'): # likely a channel like thing + elif hasattr(file, 'send'): file = WriteFile(file.send) + elif callable(file): + file = WriteFile(file) if hasattr(file, 'isatty') and file.isatty(): return TerminalOut(file) else: Modified: py/branch/config/py/test/testing/test_session.py ============================================================================== --- py/branch/config/py/test/testing/test_session.py (original) +++ py/branch/config/py/test/testing/test_session.py Sat Jan 20 22:19:42 2007 @@ -313,7 +313,6 @@ assert rootdir == one.dirpath() def test_exec(self): - py.test.skip("xxx work in progress") o = tmpdir.ensure('remote', dir=1) tfile = o.join('test_exec.py') tfile.write(py.code.Source(""" @@ -335,7 +334,6 @@ py.test.fail("did not see test_1 failure") def test_looponfailing(self): - py.test.skip("xxx work in progress") o = tmpdir.ensure('looponfailing', dir=1) tfile = o.join('test_looponfailing.py') tfile.write(py.code.Source(""" @@ -344,16 +342,16 @@ """)) print py.std.sys.executable config = py.test.config._reparse(['--looponfailing', str(o)]) - assert config.option._remote cls = config._getsessionclass() out = py.std.Queue.Queue() session = cls(config, out.put) pool = py._thread.WorkerPool() reply = pool.dispatch(session.main) while 1: - s = out.get() + s = out.get(timeout=1.0) if s.find('1 failed') != -1: break + print s else: py.test.fail("did not see test_1 failure") # XXX we would like to have a cleaner way to finish From hpk at codespeak.net Sat Jan 20 22:26:53 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 20 Jan 2007 22:26:53 +0100 (CET) Subject: [py-svn] r37077 - py/branch/config/py/test Message-ID: <20070120212653.E923C10078@code0.codespeak.net> Author: hpk Date: Sat Jan 20 22:26:52 2007 New Revision: 37077 Modified: py/branch/config/py/test/config.py Log: cleaning up fixoptions() a bit Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Sat Jan 20 22:26:52 2007 @@ -214,30 +214,22 @@ def fixoptions(option): """ sanity checks and making option values canonical. """ - if option.looponfailing and option.usepdb: - raise ValueError, "--looponfailing together with --pdb not supported yet." - if option.executable and option.usepdb: - raise ValueError, "--exec together with --pdb not supported yet." - - # setting a correct executable - remote = False - #if option.executable is not None: - # remote = True - # exe = py.path.local(py.std.os.path.expanduser(option.executable)) - # if not exe.check(): - # exe = py.path.local.sysfind(option.executable) - # assert exe.check() - # option.executable = exe - #else: - # option.executable = py.std.sys.executable + # implied options if option.usepdb: if not option.nocapture: - print "--usepdb currently implies --nocapture" + print "--usepdb implies --nocapture" option.nocapture = True - - # make information available about wether we should/will be remote if option.runbrowser and not option.startserver: - #print "Cannot point browser when not starting server" + print "--runbrowser implies --startserver" option.startserver = True - # XXX: Shouldn't we fix the session here? + + # conflicting options + if option.looponfailing and option.usepdb: + raise ValueError, "--looponfailing together with --pdb not supported yet." + if option.looponfailing and option.dist: + raise ValueError, "--looponfailing together with --dist not supported yet." + if option.executable and option.usepdb: + raise ValueError, "--exec together with --pdb not supported yet." + + From guido at codespeak.net Sun Jan 21 17:17:07 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sun, 21 Jan 2007 17:17:07 +0100 (CET) Subject: [py-svn] r37096 - in py/dist/py/apigen: . testing Message-ID: <20070121161707.818921007A@code0.codespeak.net> Author: guido Date: Sun Jan 21 17:17:05 2007 New Revision: 37096 Modified: py/dist/py/apigen/apigen.py py/dist/py/apigen/htmlgen.py py/dist/py/apigen/testing/test_apigen_example.py py/dist/py/apigen/testing/test_htmlgen.py Log: Somewhat larger cleanup/refactoring of both the htmlgen code (stuff is now in classes, which is a start in cleaning up there) and the tests (factored some code out to helper functions). Modified: py/dist/py/apigen/apigen.py ============================================================================== --- py/dist/py/apigen/apigen.py (original) +++ py/dist/py/apigen/apigen.py Sun Jan 21 17:17:05 2007 @@ -36,22 +36,20 @@ all_names = dsa._get_names(filter=lambda x, y: True) namespace_tree = htmlgen.create_namespace_tree(all_names) - ns_data = htmlgen.prepare_namespace_api_pages(l, dsa, targetdir, - namespace_tree) + apb = htmlgen.ApiPageBuilder(targetdir, l, dsa) + spb = htmlgen.SourcePageBuilder(targetdir, l, pkgdir) + + ns_data = apb.prepare_namespace_pages(namespace_tree) class_names = dsa.get_class_names() - class_data, method_data = htmlgen.prepare_class_api_pages(l, dsa, - targetdir, - namespace_tree, - class_names) + class_data, method_data = apb.prepare_class_pages(namespace_tree, + class_names) function_names = dsa.get_function_names() - func_data = htmlgen.prepare_function_api_pages(l, dsa, targetdir, - namespace_tree, - function_names) - source_data = htmlgen.prepare_source_pages(l, pkgdir, targetdir) + func_data = apb.prepare_function_pages(namespace_tree, function_names) + source_data = spb.prepare_pages(pkgdir) - htmlgen.build_namespace_api_pages(l, ns_data, proj, targetdir) - htmlgen.build_class_api_pages(l, class_data, proj, targetdir) - htmlgen.build_method_api_pages(l, method_data, proj, targetdir) - htmlgen.build_function_api_pages(l, func_data, proj, targetdir) - htmlgen.build_source_pages(l, source_data, proj, pkgdir, targetdir) + apb.build_namespace_pages(ns_data, proj) + apb.build_class_pages(class_data, proj) + apb.build_method_pages(method_data, proj) + apb.build_function_pages(func_data, proj) + spb.build_pages(source_data, proj, pkgdir) Modified: py/dist/py/apigen/htmlgen.py ============================================================================== --- py/dist/py/apigen/htmlgen.py (original) +++ py/dist/py/apigen/htmlgen.py Sun Jan 21 17:17:05 2007 @@ -11,6 +11,20 @@ html = py.xml.html raw = py.xml.raw +def create_namespace_tree(dotted_names): + """ creates a tree (in dict form) from a set of dotted names + """ + ret = {} + for dn in dotted_names: + path = dn.split('.') + for i in xrange(len(path)): + ns = '.'.join(path[:i]) + itempath = '.'.join(path[:i + 1]) + if ns not in ret: + ret[ns] = [] + if itempath not in ret[ns]: + ret[ns].append(itempath) + return ret class H(html): class Description(html.div): @@ -70,111 +84,6 @@ # XXX copy and modify formatargspec to produce html return H.em(inspect.formatargspec(*inspect.getargspec(func))) -def create_namespace_tree(dotted_names): - """ creates a tree (in dict form) from a set of dotted names - """ - ret = {} - for dn in dotted_names: - path = dn.split('.') - for i in xrange(len(path)): - ns = '.'.join(path[:i]) - itempath = '.'.join(path[:i + 1]) - if ns not in ret: - ret[ns] = [] - if itempath not in ret[ns]: - ret[ns].append(itempath) - return ret - -def build_full_method_view(base, linker, dsa, dotted_name): - """ build the html for a class method """ - func = dsa.get_obj(dotted_name) - sourcefile = inspect.getsourcefile(func) - params = get_param_htmldesc(linker, func) - docstring = func.__doc__ - local_methodname = func.__name__ - if sourcefile is not None: - sourcelink = H.a('source', href=linker.get_lazyhref(sourcefile)) - else: - sourcelink = H.span('no source file available') - snippet = H.MethodDescription( - H.MethodDef(local_methodname, params, ":"), - sourcelink, - H.Docstring(docstring), - ) - return snippet - -def build_short_method_view(base, linker, dsa, dotted_name): - """ build the html for a class method """ - func = dsa.get_obj(dotted_name) - params = get_param_htmldesc(linker, func) - docstring = func.__doc__ - local_methodname = func.__name__ - snippet = H.MethodDescription( - H.MethodDef(local_methodname, params, ":"), - H.Docstring(docstring), - # XXX more info here... - ) - return snippet - -def build_class_view(base, linker, dsa, dotted_name): - """ build the html for a class """ - cls = dsa.get_obj(dotted_name) - try: - sourcefile = inspect.getsourcefile(cls) - except TypeError: - return H.div('builtin file') - if sourcefile is None: - return H.div('no source available') - if sourcefile[-1] in ['o', 'c']: - sourcefile = sourcefile[:-1] - docstring = cls.__doc__ - methods = dsa.get_class_methods(dotted_name) - basehtml = [] - bases = dsa.get_possible_base_classes(dotted_name) - for base in bases: - try: - obj = dsa.get_obj(base.name) - except KeyError: - basehtml.append(base.name) - else: - href = linker.get_lazyhref(base.name) - basehtml.append(H.BaseDescription(base.name, href=href)) - basehtml.append(',') - if basehtml: - basehtml.pop() - basehtml.append('):') - snippet = H.ClassDescription( - # XXX bases HTML - H.ClassDef('%s(' % (cls.__name__,), *basehtml), - H.a('source', href=linker.get_lazyhref(sourcefile)), - H.Docstring(docstring), - ) - snippet.append(H.h2('Functions:')) - for method in methods: - snippet += build_short_method_view(base, linker, dsa, - '%s.%s' % (dotted_name, method)) - return snippet - -def build_namespace_view(base, linker, dsa, namespace_dotted_name, - item_dotted_names): - """ build the html for a namespace (module) """ - snippet = H.NamespaceDescription( - H.NamespaceDef(namespace_dotted_name), - ) - for dotted_name in item_dotted_names: - itemname = dotted_name.split('.')[-1] - if is_private(itemname): - continue - snippet.append( - H.NamespaceItem( - H.a(itemname, - href=linker.get_lazyhref(dotted_name) - ) - ) - ) - return snippet - -# XXX nav functions need cleanup!! def build_navitem_html(linker, name, linkid, indent, selected): href = linker.get_lazyhref(linkid) navitem = H.NavigationItem((indent * 2 * u'\xa0'), H.a(name, href=href)) @@ -182,38 +91,6 @@ navitem.attr.class_ = 'selected' return navitem -def build_api_navigation(linker, dsa, dotted_name, item_dotted_names, - selection): - navitems = [] - - # top namespace, index.html - module_name = dsa.get_module_name().split('/')[-1] - navitems.append(build_navitem_html(linker, module_name, '', 0, - (selection == ''))) - - indent = 1 - path = dotted_name.split('.') - if dotted_name != '': - # build html for each item in path to dotted_name item - for i in xrange(len(path)): - name = path[i] - item_dotted_name = '.'.join(path[:i+1]) - selected = (selection == item_dotted_name) - navitems.append(build_navitem_html(linker, name, - item_dotted_name, indent, - selected)) - indent += 1 - - # build sub items of dotted_name item - for item_dotted_name in py.builtin.sorted(item_dotted_names): - itemname = item_dotted_name.split('.')[-1] - if is_private(itemname): - continue - selected = (item_dotted_name == selection) - navitems.append(build_navitem_html(linker, itemname, - item_dotted_name, indent, selected)) - return H.Navigation(*navitems) - def source_dirs_files(fspath): """ returns a tuple (dirs, files) for fspath @@ -237,250 +114,364 @@ files.append(child) return sorted(dirs), sorted(files) -def build_source_navigation(linker, projroot, fspath, outputpath): - nav = H.Navigation() - relpath = fspath.relto(projroot) - path = relpath.split('/') - indent = 0 - # build links to parents - for i in xrange(len(path)): - dirpath = '/'.join(path[:i]) - abspath = projroot.join(dirpath).strpath - if i == 0: - text = 'root' - else: - text = path[i-1] - nav.append(build_navitem_html(linker, text, abspath, indent, False)) - indent += 1 - # build siblings or children and self - if fspath.check(dir=True): - # we're a dir, build ourselves and our children - dirpath = fspath - nav.append(build_navitem_html(linker, dirpath.basename, - dirpath.strpath, indent, True)) - indent += 1 - elif fspath.strpath == projroot.strpath: - dirpath = fspath - else: - # we're a file, build our parent's children only - dirpath = fspath.dirpath() - diritems, fileitems = source_dirs_files(dirpath) - for dir in diritems: - nav.append(build_navitem_html(linker, dir.basename, dir.strpath, - indent, False)) - for file in fileitems: - selected = (fspath.check(file=True) and - file.basename == fspath.basename) - nav.append(build_navitem_html(linker, file.basename, file.strpath, - indent, selected)) - return nav - -re = py.std.re -_reg_body = re.compile(r']*>(.*)', re.S) -def build_source_python_page(linker, projroot, fspath, outputpath): - mod = source_browser.parse_path(fspath) - # XXX let's cheat a bit here... there should be a different function using - # the linker, and returning a proper py.xml.html element, at some point - html = source_html.create_html(mod) - snippet = _reg_body.search(html).group(1) - tag = H.SourceDef(raw(snippet)) - nav = build_source_navigation(linker, projroot, fspath, outputpath) - return tag, nav - -def build_source_dir_page(linker, projroot, fspath, outputpath): - tag = H.DirList() - for path in fspath.listdir(): - if path.ext in ['.pyc', '.pyo'] or path.basename.startswith('.'): - continue - tag.append(H.DirListItem(H.a(path.basename, - href=linker.get_lazyhref(str(path))))) - nav = build_source_navigation(linker, projroot, fspath, outputpath) - return tag, nav - -def build_source_nonpython_page(linker, projroot, fspath, outputpath): - try: - tag = H.NonPythonSource(unicode(fspath.read(), 'utf-8')) - except UnicodeError: - tag = H.NonPythonSource('no source available (binary file?)') - nav = build_source_navigation(linker, projroot, fspath, outputpath) - return tag, nav - -# the build_*_pages methods all do two-pass page generation (first pass builds -# the link db, second uses it) -def prepare_source_pages(linker, base, outputbase): - passed = [] - for fspath in [base] + list(base.visit()): - if fspath.ext in ['.pyc', '.pyo']: - continue - relfspath = fspath.relto(base) - if relfspath.find('/.') > -1: - # skip hidden dirs and files - continue - elif fspath.check(dir=True): - if relfspath != '': - relfspath += '/' - reloutputpath = 'source/%sindex.html' % (relfspath,) - else: - reloutputpath = "source/%s.html" % (relfspath,) - outputpath = outputbase.join(reloutputpath) - linker.set_link(str(fspath), reloutputpath) - passed.append((fspath, outputpath)) - return passed - -def build_source_pages(linker, data, project, projroot, outputbase): - """ build syntax-colored source views """ - for fspath, outputpath in data: - if fspath.check(ext='.py'): - try: - tag, nav = build_source_python_page(linker, projroot, fspath, - outputpath) - except (KeyboardInterrupt, SystemError): - raise - except: # XXX strange stuff going wrong at times... need to fix - exc, e, tb = py.std.sys.exc_info() - print '%s - %s' % (exc, e) - print - print ''.join(py.std.traceback.format_tb(tb)) - print '-' * 79 - del tb - tag, nav = build_source_nonpython_page(linker, projroot, - fspath, outputpath) - elif fspath.check(dir=True): - tag, nav = build_source_dir_page(linker, projroot, fspath, - outputpath) - else: - tag, nav = build_source_nonpython_page(linker, projroot, fspath, - outputpath) - stylesheeturl = relpath('%s/' % (outputpath.dirpath(),), - '%s' % (outputbase.join('style.css'),)) - page = wrap_page(project, 'sources for %s' % (fspath.basename,), - tag, nav, outputbase, stylesheeturl) - outputpath.ensure() - reltargetpath = outputpath.relto(outputbase) - content = linker.call_withbase(reltargetpath, page.unicode) - outputpath.write(content.encode("utf8")) - -def prepare_class_api_pages(linker, dsa, base, namespace_tree, - classes_dotted_names): - passed = [] - methodsdata = [] - for dotted_name in classes_dotted_names: - parent_dotted_name, _ = split_of_last_part(dotted_name) - try: - sibling_dotted_names = namespace_tree[parent_dotted_name] - except KeyError: - sibling_dotted_names = [] # no siblings (built-in module or sth) - tag = build_class_view(base, linker, dsa, dotted_name) - nav = build_api_navigation(linker, dsa, parent_dotted_name, - sibling_dotted_names, dotted_name) - reltargetpath = "api/%s.html" % (dotted_name,) - linker.set_link(dotted_name, reltargetpath) - passed.append((dotted_name, tag, nav, reltargetpath)) - method_dotted_names = ['%s.%s' % (dotted_name, method_name) for - method_name in - dsa.get_class_methods(dotted_name)] - methodsdata += prepare_method_api_pages(linker, dsa, base, - namespace_tree, - method_dotted_names) - return passed, methodsdata - -def build_class_api_pages(linker, data, project, outputbase): - """ build the full api pages for a set of classes """ - for dotted_name, tag, nav, reltargetpath in data: - targetpath = outputbase.ensure(reltargetpath) - stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), - outputbase.join('style.css').strpath) - page = wrap_page(project, 'api documentation for %s' % (dotted_name,), - tag, nav, outputbase, stylesheeturl) - content = linker.call_withbase(reltargetpath, page.unicode) - targetpath.write(content.encode("utf8")) - -def prepare_method_api_pages(linker, dsa, base, namespace_tree, - method_dotted_names): - # XXX note that even though these pages are still built, there's no nav - # pointing to them anymore... - passed = [] - for dotted_name in method_dotted_names: - parent_dotted_name, _ = split_of_last_part(dotted_name) - module_dotted_name, _ = split_of_last_part(parent_dotted_name) - sibling_dotted_names = namespace_tree[module_dotted_name] - tag = build_full_method_view(base, linker, dsa, dotted_name) - nav = build_api_navigation(linker, dsa, parent_dotted_name, - sibling_dotted_names, dotted_name) - reltargetpath = "api/%s.html" % (dotted_name,) - linker.set_link(dotted_name, reltargetpath) - passed.append((dotted_name, tag, nav, reltargetpath)) - return passed - -def build_method_api_pages(linker, data, project, outputbase): - for dotted_name, tag, nav, reltargetpath in data: - targetpath = outputbase.join(reltargetpath) +class AbstractPageBuilder(object): + def write_page(self, title, reltargetpath, project, tag, nav): + targetpath = self.base.join(reltargetpath) stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), - outputbase.join('style.css').strpath) - page = wrap_page(project, 'api documentation for %s' % (dotted_name,), - tag, nav, outputbase, stylesheeturl) - content = linker.call_withbase(reltargetpath, page.unicode) + self.base.join('style.css').strpath) + page = wrap_page(project, title, + tag, nav, self.base, stylesheeturl) + content = self.linker.call_withbase(reltargetpath, page.unicode) targetpath.ensure() targetpath.write(content.encode("utf8")) -def prepare_function_api_pages(linker, dsa, base, namespace_tree, - method_dotted_names): - passed = [] - for dotted_name in method_dotted_names: - # XXX should we create a build_full_function_view instead? - parent_dotted_name, _ = split_of_last_part(dotted_name) - sibling_dotted_names = namespace_tree[parent_dotted_name] - tag = build_full_method_view(base, linker, dsa, dotted_name) - nav = build_api_navigation(linker, dsa, parent_dotted_name, - sibling_dotted_names, dotted_name) - reltargetpath = "api/%s.html" % (dotted_name,) - linker.set_link(dotted_name, reltargetpath) - passed.append((dotted_name, tag, nav, reltargetpath)) - return passed - -def build_function_api_pages(linker, data, project, outputbase): - for dotted_name, tag, nav, reltargetpath in data: - targetpath = outputbase.join(reltargetpath) - stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), - outputbase.join('style.css').strpath) - page = wrap_page(project, 'api documentation for %s' % (dotted_name,), - tag, nav, outputbase, stylesheeturl) - content = linker.call_withbase(reltargetpath, page.unicode) - targetpath.ensure() - targetpath.write(content.encode("utf8")) +class SourcePageBuilder(AbstractPageBuilder): + """ builds the html for a source docs page """ + def __init__(self, base, linker, projroot): + self.base = base + self.linker = linker + self.projroot = projroot + + def build_navigation(self, fspath): + nav = H.Navigation() + relpath = fspath.relto(self.projroot) + path = relpath.split('/') + indent = 0 + # build links to parents + for i in xrange(len(path)): + dirpath = '/'.join(path[:i]) + abspath = self.projroot.join(dirpath).strpath + if i == 0: + text = 'root' + else: + text = path[i-1] + nav.append(build_navitem_html(self.linker, text, abspath, + indent, False)) + indent += 1 + # build siblings or children and self + if fspath.check(dir=True): + # we're a dir, build ourselves and our children + dirpath = fspath + nav.append(build_navitem_html(self.linker, dirpath.basename, + dirpath.strpath, indent, True)) + indent += 1 + elif fspath.strpath == self.projroot.strpath: + dirpath = fspath + else: + # we're a file, build our parent's children only + dirpath = fspath.dirpath() + diritems, fileitems = source_dirs_files(dirpath) + for dir in diritems: + nav.append(build_navitem_html(self.linker, dir.basename, + dir.strpath, indent, False)) + for file in fileitems: + selected = (fspath.check(file=True) and + file.basename == fspath.basename) + nav.append(build_navitem_html(self.linker, file.basename, + file.strpath, indent, selected)) + return nav + + re = py.std.re + _reg_body = re.compile(r']*>(.*)', re.S) + def build_python_page(self, fspath): + mod = source_browser.parse_path(fspath) + # XXX let's cheat a bit here... there should be a different function + # using the linker, and returning a proper py.xml.html element, + # at some point + html = source_html.create_html(mod) + snippet = self._reg_body.search(html).group(1) + tag = H.SourceDef(raw(snippet)) + nav = self.build_navigation(fspath) + return tag, nav + + def build_dir_page(self, fspath): + tag = H.DirList() + dirs, files = source_dirs_files(fspath) + tag.append(H.h2('directories')) + for path in dirs: + tag.append(H.DirListItem(H.a(path.basename, + href=self.linker.get_lazyhref(str(path))))) + tag.append(H.h2('files')) + for path in files: + tag.append(H.DirListItem(H.a(path.basename, + href=self.linker.get_lazyhref(str(path))))) + nav = self.build_navigation(fspath) + return tag, nav -def prepare_namespace_api_pages(linker, dsa, base, namespace_tree): - passed = [] - module_name = dsa.get_module_name().split('/')[-1] - - names = namespace_tree.keys() - names.sort() - for dotted_name in names: - subitem_dotted_names = namespace_tree[dotted_name] - tag = build_namespace_view(base, linker, dsa, dotted_name, - subitem_dotted_names) - nav = build_api_navigation(linker, dsa, dotted_name, - subitem_dotted_names, dotted_name) - if dotted_name == '': - reltargetpath = 'api/index.html' + def build_nonpython_page(self, fspath): + try: + tag = H.NonPythonSource(unicode(fspath.read(), 'utf-8')) + except UnicodeError: + tag = H.NonPythonSource('no source available (binary file?)') + nav = self.build_navigation(fspath) + return tag, nav + + def prepare_pages(self, base): + passed = [] + for fspath in [base] + list(base.visit()): + if fspath.ext in ['.pyc', '.pyo']: + continue + relfspath = fspath.relto(base) + if relfspath.find('/.') > -1: + # skip hidden dirs and files + continue + elif fspath.check(dir=True): + if relfspath != '': + relfspath += '/' + reloutputpath = 'source/%sindex.html' % (relfspath,) + else: + reloutputpath = "source/%s.html" % (relfspath,) + outputpath = self.base.join(reloutputpath) + self.linker.set_link(str(fspath), reloutputpath) + passed.append((fspath, outputpath)) + return passed + + def build_pages(self, data, project, base): + """ build syntax-colored source views """ + for fspath, outputpath in data: + if fspath.check(ext='.py'): + try: + tag, nav = self.build_python_page(fspath) + except (KeyboardInterrupt, SystemError): + raise + except: # XXX strange stuff going wrong at times... need to fix + exc, e, tb = py.std.sys.exc_info() + print '%s - %s' % (exc, e) + print + print ''.join(py.std.traceback.format_tb(tb)) + print '-' * 79 + del tb + tag, nav = self.build_nonpython_page(fspath) + elif fspath.check(dir=True): + tag, nav = self.build_dir_page(fspath) + else: + tag, nav = self.build_nonpython_page(fspath) + title = 'sources for %s' % (fspath.basename,) + reltargetpath = outputpath.relto(self.base) + self.write_page(title, reltargetpath, project, tag, nav) + +class ApiPageBuilder(AbstractPageBuilder): + """ builds the html for an api docs page """ + def __init__(self, base, linker, dsa): + self.base = base + self.linker = linker + self.dsa = dsa + + def build_full_method_view(self, dotted_name): + """ build the html for a class method """ + func = self.dsa.get_obj(dotted_name) + sourcefile = inspect.getsourcefile(func) + params = get_param_htmldesc(self.linker, func) + docstring = func.__doc__ + local_methodname = func.__name__ + if sourcefile is not None: + sourcelink = H.a('source', + href=self.linker.get_lazyhref(sourcefile)) else: - reltargetpath = 'api/%s.html' % (dotted_name,) - linker.set_link(dotted_name, reltargetpath) - passed.append((dotted_name, tag, nav, reltargetpath)) - return passed - -def build_namespace_api_pages(linker, data, project, outputbase): - for dotted_name, tag, nav, reltargetpath in data: - if dotted_name == '': - dotted_name = 'project root' - targetpath = outputbase.join(reltargetpath) - stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), - outputbase.join('style.css').strpath) - page = wrap_page(project, 'index of %s namespace' % (dotted_name,), - tag, nav, outputbase, stylesheeturl) - content = linker.call_withbase(reltargetpath, page.unicode) - targetpath.ensure() - targetpath.write(content.encode("utf8")) + sourcelink = H.span('no source file available') + snippet = H.MethodDescription( + H.MethodDef(local_methodname, params, ":"), + sourcelink, + H.Docstring(docstring), + ) + return snippet + + def build_short_method_view(self, dotted_name): + """ build the html for a class method """ + func = self.dsa.get_obj(dotted_name) + params = get_param_htmldesc(self.linker, func) + docstring = func.__doc__ + local_methodname = func.__name__ + snippet = H.MethodDescription( + H.MethodDef(local_methodname, params, ":"), + H.Docstring(docstring), + # XXX more info here... + ) + return snippet + + def build_class_view(self, dotted_name): + """ build the html for a class """ + cls = self.dsa.get_obj(dotted_name) + try: + sourcefile = inspect.getsourcefile(cls) + except TypeError: + return H.div('builtin file') + if sourcefile is None: + return H.div('no source available') + if sourcefile[-1] in ['o', 'c']: + sourcefile = sourcefile[:-1] + docstring = cls.__doc__ + methods = self.dsa.get_class_methods(dotted_name) + basehtml = [] + bases = self.dsa.get_possible_base_classes(dotted_name) + for base in bases: + try: + obj = self.dsa.get_obj(base.name) + except KeyError: + basehtml.append(base.name) + else: + href = self.linker.get_lazyhref(base.name) + basehtml.append(H.BaseDescription(base.name, href=href)) + basehtml.append(',') + if basehtml: + basehtml.pop() + basehtml.append('):') + snippet = H.ClassDescription( + # XXX bases HTML + H.ClassDef('%s(' % (cls.__name__,), *basehtml), + H.a('source', href=self.linker.get_lazyhref(sourcefile)), + H.Docstring(docstring), + ) + snippet.append(H.h2('Functions:')) + for method in methods: + snippet += self.build_short_method_view('%s.%s' % (dotted_name, + method)) + return snippet + + def build_namespace_view(self, namespace_dotted_name, item_dotted_names): + """ build the html for a namespace (module) """ + snippet = H.NamespaceDescription( + H.NamespaceDef(namespace_dotted_name), + ) + for dotted_name in item_dotted_names: + itemname = dotted_name.split('.')[-1] + if is_private(itemname): + continue + snippet.append( + H.NamespaceItem( + H.a(itemname, + href=self.linker.get_lazyhref(dotted_name) + ) + ) + ) + return snippet + + def prepare_class_pages(self, namespace_tree, classes_dotted_names): + passed = [] + methodsdata = [] + for dotted_name in classes_dotted_names: + parent_dotted_name, _ = split_of_last_part(dotted_name) + try: + sibling_dotted_names = namespace_tree[parent_dotted_name] + except KeyError: + # no siblings (built-in module or sth) + sibling_dotted_names = [] + tag = self.build_class_view(dotted_name) + nav = self.build_navigation(parent_dotted_name, + sibling_dotted_names, dotted_name) + reltargetpath = "api/%s.html" % (dotted_name,) + self.linker.set_link(dotted_name, reltargetpath) + passed.append((dotted_name, tag, nav, reltargetpath)) + method_dotted_names = ['%s.%s' % (dotted_name, method_name) for + method_name in + self.dsa.get_class_methods(dotted_name)] + methodsdata += self.prepare_method_pages(namespace_tree, + method_dotted_names) + return passed, methodsdata + + def build_class_pages(self, data, project): + """ build the full api pages for a set of classes """ + for dotted_name, tag, nav, reltargetpath in data: + title = 'api documentation for %s' % (dotted_name,) + self.write_page(title, reltargetpath, project, tag, nav) + + def prepare_method_pages(self, namespace_tree, method_dotted_names): + # XXX note that even though these pages are still built, there's no nav + # pointing to them anymore... + passed = [] + for dotted_name in method_dotted_names: + parent_dotted_name, _ = split_of_last_part(dotted_name) + module_dotted_name, _ = split_of_last_part(parent_dotted_name) + sibling_dotted_names = namespace_tree[module_dotted_name] + tag = self.build_full_method_view(dotted_name) + nav = self.build_navigation(parent_dotted_name, + sibling_dotted_names, dotted_name) + reltargetpath = "api/%s.html" % (dotted_name,) + self.linker.set_link(dotted_name, reltargetpath) + passed.append((dotted_name, tag, nav, reltargetpath)) + return passed + + def build_method_pages(self, data, project): + for dotted_name, tag, nav, reltargetpath in data: + title = 'api documentation for %s' % (dotted_name,) + self.write_page(title, reltargetpath, project, tag, nav) + + def prepare_function_pages(self, namespace_tree, method_dotted_names): + passed = [] + for dotted_name in method_dotted_names: + # XXX should we create a build_full_function_view instead? + parent_dotted_name, _ = split_of_last_part(dotted_name) + sibling_dotted_names = namespace_tree[parent_dotted_name] + tag = self.build_full_method_view(dotted_name) + nav = self.build_navigation(parent_dotted_name, + sibling_dotted_names, dotted_name) + reltargetpath = "api/%s.html" % (dotted_name,) + self.linker.set_link(dotted_name, reltargetpath) + passed.append((dotted_name, tag, nav, reltargetpath)) + return passed + + def build_function_pages(self, data, project): + for dotted_name, tag, nav, reltargetpath in data: + title = 'api documentation for %s' % (dotted_name,) + self.write_page(title, reltargetpath, project, tag, nav) + + def prepare_namespace_pages(self, namespace_tree): + passed = [] + module_name = self.dsa.get_module_name().split('/')[-1] + + names = namespace_tree.keys() + names.sort() + for dotted_name in names: + subitem_dotted_names = namespace_tree[dotted_name] + tag = self.build_namespace_view(dotted_name, subitem_dotted_names) + nav = self.build_navigation(dotted_name, subitem_dotted_names, + dotted_name) + if dotted_name == '': + reltargetpath = 'api/index.html' + else: + reltargetpath = 'api/%s.html' % (dotted_name,) + self.linker.set_link(dotted_name, reltargetpath) + passed.append((dotted_name, tag, nav, reltargetpath)) + return passed + + def build_namespace_pages(self, data, project): + for dotted_name, tag, nav, reltargetpath in data: + if dotted_name == '': + dotted_name = 'project root' + title = 'index of %s namespace' % (dotted_name,) + self.write_page(title, reltargetpath, project, tag, nav) + + def build_navigation(self, dotted_name, item_dotted_names, selection): + navitems = [] + + # top namespace, index.html + module_name = self.dsa.get_module_name().split('/')[-1] + navitems.append(build_navitem_html(self.linker, module_name, '', 0, + (selection == ''))) + + indent = 1 + path = dotted_name.split('.') + if dotted_name != '': + # build html for each item in path to dotted_name item + for i in xrange(len(path)): + name = path[i] + item_dotted_name = '.'.join(path[:i+1]) + selected = (selection == item_dotted_name) + navitems.append(build_navitem_html(self.linker, name, + item_dotted_name, indent, + selected)) + indent += 1 + + # build sub items of dotted_name item + for item_dotted_name in py.builtin.sorted(item_dotted_names): + itemname = item_dotted_name.split('.')[-1] + if is_private(itemname): + continue + selected = (item_dotted_name == selection) + navitems.append(build_navitem_html(self.linker, itemname, + item_dotted_name, indent, + selected)) + return H.Navigation(*navitems) def wrap_page(project, title, contentel, navel, outputpath, stylesheeturl): page = LayoutPage(project, title, nav=navel, encoding='UTF-8', Modified: py/dist/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_example.py (original) +++ py/dist/py/apigen/testing/test_apigen_example.py Sun Jan 21 17:17:05 2007 @@ -7,6 +7,17 @@ from py.__.test.web import webcheck from py.__.apigen.conftest import option +def run_string_sequence_test(data, seq): + currpos = -1 + for s in seq: + newpos = data.find(s) + if currpos >= newpos: + if newpos == -1: + message = 'not found' + else: + message = 'unexpected position: %s' % (newpos,) + py.test.fail('string %r: %s' % (s, message)) + def setup_fs_project(tempname='apigen_example'): temp = py.test.ensuretemp(tempname) temp.ensure("pkg/func.py").write(py.code.Source("""\ @@ -49,7 +60,9 @@ return dsa def _checkhtml(htmlstring): - assert isinstance(htmlstring, (unicode, str)) + if isinstance(htmlstring, unicode): + htmlstring = htmlstring.encode('UTF-8', 'replace') + assert isinstance(htmlstring, str) if option.webcheck: webcheck.check_html(htmlstring) else: @@ -63,7 +76,7 @@ #"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n""" + unicode(h) #_checkhtml(newstring) -class TestExampleProject(object): +class AbstractBuilderTest(object): def setup_class(cls): cls.fs_root, cls.pkg_name = setup_fs_project() cls.dsa = get_dsa(cls.fs_root, cls.pkg_name) @@ -76,218 +89,164 @@ return super(LinkerForTests, self).get_target(linkid) except KeyError: return 'unknown_link_%s' % (linkid,) - self.linker = LinkerForTests() + self.base = base = py.test.ensuretemp('%s_%s' % ( + self.__class__.__name__, meth.im_func.func_name)) + self.linker = linker = LinkerForTests() + self.apb = ApiPageBuilder(base, linker, self.dsa) + self.spb = SourcePageBuilder(base, linker, self.fs_root) +class TestApiPageBuilder(AbstractBuilderTest): def test_build_full_method_view(self): - base = py.test.ensuretemp('build_full_method_view') - snippet = build_full_method_view(base, self.linker, self.dsa, - 'pkg.sub.func') + snippet = self.apb.build_full_method_view('pkg.sub.func') html = snippet.unicode() _checkhtmlsnippet(html) - def test_build_function_api_pages(self): - base = py.test.ensuretemp('build_function_api_pages') + def test_build_function_pages(self): namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) - data = prepare_function_api_pages(self.linker, self.dsa, - base, namespace_tree, - ['pkg.sub.func']) - build_function_api_pages(self.linker, data, self.project, base) - funcfile = base.join('api/pkg.sub.func.html') + data = self.apb.prepare_function_pages(namespace_tree, + ['pkg.sub.func']) + self.apb.build_function_pages(data, self.project) + funcfile = self.base.join('api/pkg.sub.func.html') assert funcfile.check() html = funcfile.read() _checkhtml(html) def test_build_class_view(self): - base = py.test.ensuretemp('build_class_view') - snippet = build_class_view(base, self.linker, self.dsa, - 'pkg.SomeClass') + snippet = self.apb.build_class_view('pkg.SomeClass') html = snippet.unicode() _checkhtmlsnippet(html) - def test_build_class_api_pages(self): - base = py.test.ensuretemp('build_class_api_pages') + def test_build_class_pages(self): namespace_tree = create_namespace_tree(['pkg.SomeClass', 'pkg.SomeSubClass', 'pkg.sub.func']) - data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, - base, namespace_tree, - ['pkg.SomeClass', - 'pkg.SomeSubClass']) - build_class_api_pages(self.linker, data, self.project, base) - clsfile = base.join('api/pkg.SomeClass.html') + data, methodsdata = self.apb.prepare_class_pages(namespace_tree, + ['pkg.SomeClass', + 'pkg.SomeSubClass']) + self.apb.build_class_pages(data, self.project) + clsfile = self.base.join('api/pkg.SomeClass.html') assert clsfile.check() html = clsfile.read() _checkhtml(html) - def test_build_class_api_pages_nav_links(self): - base = py.test.ensuretemp('build_class_api_pages_nav_links') + def test_build_class_pages_nav_links(self): namespace_tree = create_namespace_tree(['pkg.SomeClass', 'pkg.SomeSubClass', 'pkg.sub.func']) - data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, - base, namespace_tree, - ['pkg.SomeSubClass', 'pkg.SomeClass']) + data, methodsdata = self.apb.prepare_class_pages(namespace_tree, + ['pkg.SomeSubClass', + 'pkg.SomeClass']) # fake some stuff that would be built from other methods self.linker.set_link('', 'api/index.html') self.linker.set_link('pkg', 'api/pkg.html') - build_class_api_pages(self.linker, data, self.project, base) - clsfile = base.join('api/pkg.SomeClass.html') + self.apb.build_class_pages(data, self.project) + clsfile = self.base.join('api/pkg.SomeClass.html') assert clsfile.check() html = clsfile.read() print html # note that the root and the first level both have the same name (pkg) # in our example project (XXX fixme!!) - assert 'href="../style.css"' in html - assert 'href="index.html">pkg' in html - assert 'href="pkg.html">pkg' in html - assert 'href="pkg.SomeClass.html">SomeClass' in html - assert 'href="pkg.SomeSubClass.html">SomeSubClass' in html + run_string_sequence_test(html, [ + 'href="../style.css"', + 'href="index.html">pkg', + 'href="pkg.html">pkg', + 'href="pkg.SomeClass.html">SomeClass', + 'href="pkg.SomeSubClass.html">SomeSubClass', + ]) assert not 'href="pkg.sub.func.html"' in html py.test.skip('WOP from here') assert 'href="pkg.sub.html">sub' in html _checkhtml(html) - def test_build_class_api_pages_base_link(self): - base = py.test.ensuretemp('build_class_api_pages_base_link') + def test_build_class_pages_base_link(self): namespace_tree = create_namespace_tree(['pkg.SomeClass', 'pkg.SomeSubClass', 'pkg.sub.func']) - data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, - base, namespace_tree, - ['pkg.SomeSubClass', 'pkg.SomeClass']) - build_class_api_pages(self.linker, data, self.project, base) - clsfile = base.join('api/pkg.SomeSubClass.html') + data, methodsdata = self.apb.prepare_class_pages(namespace_tree, + ['pkg.SomeSubClass', + 'pkg.SomeClass']) + self.apb.build_class_pages(data, self.project) + clsfile = self.base.join('api/pkg.SomeSubClass.html') assert clsfile.check() html = clsfile.read() print html - assert 'href="../style.css"' in html - assert 'href="pkg.SomeClass.html">pkg.SomeClass' in html + run_string_sequence_test(html, [ + 'href="../style.css"', + 'href="pkg.SomeClass.html">pkg.SomeClass', + ]) _checkhtml(html) - def test_build_source_pages(self): - base = py.test.ensuretemp('build_source_pages') - data = prepare_source_pages(self.linker, self.fs_root, base) - build_source_pages(self.linker, data, self.project, self.fs_root, base) - somesource = base.join('source/pkg/func.py.html').read() - _checkhtml(somesource) - - def test_build_source_pages_nav(self): - base = py.test.ensuretemp('build_source_pages_nav') - data = prepare_source_pages(self.linker, self.fs_root, base) - build_source_pages(self.linker, data, self.project, self.fs_root, base) - funcsource = base.join('source/pkg/func.py.html') - assert funcsource.check(file=True) - html = funcsource.read() - print html - assert 'href="../../style.css"' in html - assert 'root' in html - assert 'pkg' in html - assert 'someclass.py' in html - assert 'somesubclass.py' in html - - def test_api_source_links(self): - base = py.test.ensuretemp('api_source_links') + def test_source_links(self): namespace_tree = create_namespace_tree(['pkg.SomeClass', 'pkg.SomeSubClass', 'pkg.sub.func']) - data, methodsdata = prepare_class_api_pages(self.linker, self.dsa, - base, namespace_tree, - ['pkg.SomeSubClass', 'pkg.SomeClass']) - sourcedata = prepare_source_pages(self.linker, self.fs_root, base) - build_class_api_pages(self.linker, data, self.project, base) - build_source_pages(self.linker, sourcedata, self.project, self.fs_root, - base) - funchtml = base.join('api/pkg.SomeClass.html').read() + data, methodsdata = self.apb.prepare_class_pages(namespace_tree, + ['pkg.SomeSubClass', + 'pkg.SomeClass']) + sourcedata = self.spb.prepare_pages(self.fs_root) + self.apb.build_class_pages(data, self.project) + self.spb.build_pages(sourcedata, self.project, self.fs_root) + funchtml = self.base.join('api/pkg.SomeClass.html').read() assert funchtml.find('href="../source/pkg/someclass.py.html"') > -1 _checkhtml(funchtml) - def test_create_namespace_tree(self): - namespace_tree = create_namespace_tree(['pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) - assert namespace_tree == {'': ['pkg'], - 'pkg.sub': ['pkg.sub.func'], - 'pkg': ['pkg.sub', 'pkg.SomeClass', - 'pkg.SomeSubClass']} - - def test_build_namespace_api_pages_index(self): - base = py.test.ensuretemp('build_namespace_api_pages') + def test_build_namespace_pages_index(self): namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) - data = prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) - prepare_class_api_pages(self.linker, self.dsa, base, - namespace_tree, - ['pkg.SomeClass', 'pkg.SomeSubClass']) - prepare_function_api_pages(self.linker, self.dsa, base, - namespace_tree, ['pkg.sub.func']) - prepare_source_pages(self.linker, self.fs_root, base) - build_namespace_api_pages(self.linker, data, self.project, base) - pkgfile = base.join('api/pkg.html') + data = self.apb.prepare_namespace_pages(namespace_tree) + self.apb.prepare_class_pages(namespace_tree, + ['pkg.SomeClass', + 'pkg.SomeSubClass']) + self.apb.prepare_function_pages(namespace_tree, ['pkg.sub.func']) + self.apb.build_namespace_pages(data, self.project) + pkgfile = self.base.join('api/pkg.html') assert pkgfile.check() html = pkgfile.read() _checkhtml(html) - def test_build_namespace_api_pages_subnamespace(self): - base = py.test.ensuretemp('build_namespace_api_pages') + def test_build_namespace_pages_subnamespace(self): namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) - data = prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) - build_namespace_api_pages(self.linker, data, self.project, base) - subfile = base.join('api/pkg.sub.html') + data = self.apb.prepare_namespace_pages(namespace_tree) + self.apb.build_namespace_pages(data, self.project) + subfile = self.base.join('api/pkg.sub.html') assert subfile.check() html = subfile.read() _checkhtml(html) - def test_build_source_dir_page(self): - base = py.test.ensuretemp('build_source_dir_page') - data = prepare_source_pages(self.linker, self.fs_root, base) - build_source_pages(self.linker, data, self.project, self.fs_root, base) - pkgindex = base.join('source/pkg/index.html') - assert pkgindex.check(file=True) - html = pkgindex.read() - print html - assert 'someclass.py' in html - _checkhtml(html) - def test_build_function_api_pages_nav(self): - base = py.test.ensuretemp('build_function_api_pages_nav') - prepare_source_pages(self.linker, self.fs_root, base) namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) - data = prepare_function_api_pages(self.linker, self.dsa, - base, namespace_tree, - ['pkg.sub.func']) + data = self.apb.prepare_function_pages(namespace_tree, + ['pkg.sub.func']) self.linker.set_link('', 'api/index.html') self.linker.set_link('pkg', 'api/pkg.html') self.linker.set_link('pkg.sub', 'api/pkg.sub.html') - build_function_api_pages(self.linker, data, self.project, base) - funcfile = base.join('api/pkg.sub.func.html') + self.apb.build_function_pages(data, self.project) + funcfile = self.base.join('api/pkg.sub.func.html') html = funcfile.read() print html - assert '' in html - assert '' in html - assert '' in html - assert '' in html + run_string_sequence_test(html, [ + '', + '', + '', + '', + ]) + _checkhtml(html) def test_build_function_navigation(self): - base = py.test.ensuretemp('build_function_navigation') - prepare_source_pages(self.linker, self.fs_root, base) namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) - prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) - prepare_function_api_pages(self.linker, self.dsa, base, - namespace_tree, ['pkg.sub.func']) - nav = build_api_navigation(self.linker, self.dsa, 'pkg.sub', - ['pkg.sub.func'], 'pkg.sub.func') + self.apb.prepare_namespace_pages(namespace_tree) + self.apb.prepare_function_pages(namespace_tree, ['pkg.sub.func']) + nav = self.apb.build_navigation('pkg.sub', ['pkg.sub.func'], + 'pkg.sub.func') html = nav.unicode(indent=0) print html.encode('UTF-8') assert (u'

pkg

' @@ -299,29 +258,67 @@ ) in html def test_build_root_namespace_view(self): - base = py.test.ensuretemp('build_root_namespace_view') namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', 'pkg.SomeClass', 'pkg.SomeSubClass']) - data = prepare_namespace_api_pages(self.linker, self.dsa, base, - namespace_tree) - build_namespace_api_pages(self.linker, data, self.project, base) - rootfile = base.join('api/index.html') + data = self.apb.prepare_namespace_pages(namespace_tree) + self.apb.build_namespace_pages(data, self.project) + rootfile = self.base.join('api/index.html') assert rootfile.check() html = rootfile.read() assert '' in html _checkhtml(html) - def test_build_source_navigation_root(self): - base = py.test.ensuretemp('test_build_source_navigation') - prepare_source_pages(self.linker, self.fs_root, base) - nav = build_source_navigation(self.linker, self.fs_root, - self.fs_root.join('pkg'), base) +class TestSourcePageBuilder(AbstractBuilderTest): + def test_build_pages(self): + data = self.spb.prepare_pages(self.fs_root) + self.spb.build_pages(data, self.project, self.fs_root) + somesource = self.base.join('source/pkg/func.py.html').read() + _checkhtml(somesource) + + def test_build_pages_nav(self): + data = self.spb.prepare_pages(self.fs_root) + self.spb.build_pages(data, self.project, self.fs_root) + funcsource = self.base.join('source/pkg/func.py.html') + assert funcsource.check(file=True) + html = funcsource.read() + print html + run_string_sequence_test(html, [ + 'href="../../style.css"', + 'root', + 'pkg', + 'someclass.py', + 'somesubclass.py', + ]) + + def test_build_dir_page(self): + data = self.spb.prepare_pages(self.fs_root) + self.spb.build_pages(data, self.project, self.fs_root) + pkgindex = self.base.join('source/pkg/index.html') + assert pkgindex.check(file=True) + html = pkgindex.read() + print html + run_string_sequence_test(html, [ + 'href="../../style.css"', + 'root', + 'pkg', + 'func.py', + 'someclass.py', + 'somesubclass.py', + '

directories

', + '

files

']) + _checkhtml(html) + + def test_build_navigation_root(self): + self.spb.prepare_pages(self.fs_root) + nav = self.spb.build_navigation(self.fs_root.join('pkg')) html = nav.unicode(indent=0) print html.encode('UTF-8') - assert 'href="source/index.html">root' in html - assert 'href="source/pkg/index.html">pkg' in html - assert 'href="source/pkg/func.py.html">func.py' in html - assert 'href="source/pkg/someclass.py.html">someclass.py' in html - assert 'href="source/pkg/somesubclass.py.html">somesubclass.py' in html + run_string_sequence_test(html, [ + 'href="source/index.html">root', + 'href="source/pkg/index.html">pkg', + 'href="source/pkg/func.py.html">func.py', + 'href="source/pkg/someclass.py.html">someclass.py', + 'href="source/pkg/somesubclass.py.html">somesubclass.py', + ]) Modified: py/dist/py/apigen/testing/test_htmlgen.py ============================================================================== --- py/dist/py/apigen/testing/test_htmlgen.py (original) +++ py/dist/py/apigen/testing/test_htmlgen.py Sun Jan 21 17:17:05 2007 @@ -11,6 +11,13 @@ assert tree == {'': ['foo'], 'foo': ['foo.bar'], 'foo.bar': ['foo.bar.baz', 'foo.bar.qux']} + tree = htmlgen.create_namespace_tree(['pkg.sub.func', + 'pkg.SomeClass', + 'pkg.SomeSubClass']) + assert tree == {'': ['pkg'], + 'pkg.sub': ['pkg.sub.func'], + 'pkg': ['pkg.sub', 'pkg.SomeClass', + 'pkg.SomeSubClass']} def test_build_navitem_html(): l = Linker() From hpk at codespeak.net Mon Jan 22 00:39:28 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Mon, 22 Jan 2007 00:39:28 +0100 (CET) Subject: [py-svn] r37110 - in py/branch/config/py/test: . rsession terminal tkinter tkinter/testing Message-ID: <20070121233928.B33D510077@code0.codespeak.net> Author: hpk Date: Mon Jan 22 00:39:24 2007 New Revision: 37110 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/rsession/rsession.py py/branch/config/py/test/rsession/slave.py py/branch/config/py/test/terminal/remote.py py/branch/config/py/test/tkinter/backend.py py/branch/config/py/test/tkinter/testing/test_backend.py py/branch/config/py/test/tkinter/testing/test_capture_out_err.py Log: renaming some variables for more clarity Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Mon Jan 22 00:39:24 2007 @@ -27,36 +27,36 @@ """ central hub for dealing with configuration/initialization data. """ Option = optparse.Option conftest = Conftest() + _initialized = False def __init__(self): self.option = CmdOptions() self._parser = optparse.OptionParser( usage="usage: %prog [options] [query] [filenames of tests]") - self._parsed = False self._overwrite_dict = {} def parse(self, args): """ parse cmdline arguments into this config object. Note that this can only be called once per testing process. """ - assert not self._parsed, ( + assert not self._initialized, ( "can only parse cmdline args once per Config object") - self._parsed = True + self._initialized = True self.conftest.setinitial(args) self.conftest.rget('adddefaultoptions')() args = [str(x) for x in args] - cmdlineoption, remaining = self._parser.parse_args(args) + cmdlineoption, args = self._parser.parse_args(args) self.option.__dict__.update(vars(cmdlineoption)) fixoptions(self.option) # XXX fixing should be moved to sessions - if not remaining: - remaining.append(py.std.os.getcwd()) - self.remaining = remaining + if not args: + args.append(py.std.os.getcwd()) + self.args = args def getcolitems(self): """ return initial collectors. """ colitems = [] - if self.remaining: - for path in self.remaining: + if self.args: + for path in self.args: path = py.path.local(path) colitems.append(self._getcollector(path)) return colitems Modified: py/branch/config/py/test/rsession/rsession.py ============================================================================== --- py/branch/config/py/test/rsession/rsession.py (original) +++ py/branch/config/py/test/rsession/rsession.py Mon Jan 22 00:39:24 2007 @@ -132,7 +132,7 @@ """ def main(self, reporter=None): """ main loop for running tests. """ - args = self.config.remaining + args = self.config.args sshhosts, remotepython, rsync_roots = self.read_distributed_config() reporter, startserverflag = self.init_reporter(reporter, @@ -207,7 +207,7 @@ """ def main(self, reporter=None, runner=None): # check out if used options makes any sense - args = self.config.remaining + args = self.config.args sshhosts = [HostInfo('localhost')] # this is just an info to reporter Modified: py/branch/config/py/test/rsession/slave.py ============================================================================== --- py/branch/config/py/test/rsession/slave.py (original) +++ py/branch/config/py/test/rsession/slave.py Mon Jan 22 00:39:24 2007 @@ -128,7 +128,7 @@ sys.path.insert(0, basedir) import py config = py.test.config - if config._parsed: + if config._initialized: config = config._reparse([basedir]) else: config.conftest.setinitial([basedir]) Modified: py/branch/config/py/test/terminal/remote.py ============================================================================== --- py/branch/config/py/test/terminal/remote.py (original) +++ py/branch/config/py/test/terminal/remote.py Mon Jan 22 00:39:24 2007 @@ -88,7 +88,7 @@ self.executable = executable def main(self): - rootdir = getrootdir(self.config.remaining) + rootdir = getrootdir(self.config.args) wasfailing = False failures = [] while 1: @@ -100,7 +100,7 @@ if not self.config.option.looponfailing: break print "#" * 60 - print "# looponfailing: mode: %d failures remaining" % len(failures) + print "# looponfailing: mode: %d failures args" % len(failures) for root, names in failures: name = "/".join(names) # XXX print "Failure at: %r" % (name,) @@ -117,7 +117,7 @@ """, stdout=self.out, stderr=self.out) print "MASTER: triggered slave terminal session ->" repr = self.config.make_repr(conftestnames=[]) - channel.send((repr, self.config.remaining, failures)) + channel.send((repr, self.config.args, failures)) print "MASTER: send start info" try: return channel.receive() @@ -131,7 +131,7 @@ repr, args, failures = channel.receive() print "SLAVE: received configuration" config = py.test.config - config.remaining = args + config.args = args config.conftest.setinitial(args) config.merge_repr(repr) config.option.looponfailing = False Modified: py/branch/config/py/test/tkinter/backend.py ============================================================================== --- py/branch/config/py/test/tkinter/backend.py (original) +++ py/branch/config/py/test/tkinter/backend.py Mon Jan 22 00:39:24 2007 @@ -234,7 +234,7 @@ if tests: cols = getfailureitems(tests) else: - cols = config.remaining + cols = config.args session = ReportSession(config = config, channel=channel) session.shouldclose = channel.isclosed session.main() Modified: py/branch/config/py/test/tkinter/testing/test_backend.py ============================================================================== --- py/branch/config/py/test/tkinter/testing/test_backend.py (original) +++ py/branch/config/py/test/tkinter/testing/test_backend.py Mon Jan 22 00:39:24 2007 @@ -180,7 +180,7 @@ def test_start_tests(self): config = py.test.config._reparse([datadir/'filetest.py']) self.backend.start_tests(config = config, - args = config.remaining, + args = config.args, tests = []) while self.backend.running: self.backend.update() Modified: py/branch/config/py/test/tkinter/testing/test_capture_out_err.py ============================================================================== --- py/branch/config/py/test/tkinter/testing/test_capture_out_err.py (original) +++ py/branch/config/py/test/tkinter/testing/test_capture_out_err.py Mon Jan 22 00:39:24 2007 @@ -8,7 +8,7 @@ config = py.test.config._reparse([datadir/'filetest.py']) backend = ReportBackend() backend.start_tests(config = config, - args = config.remaining, + args = config.args, tests = []) while backend.running: backend.update() From hpk at codespeak.net Mon Jan 22 01:07:11 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Mon, 22 Jan 2007 01:07:11 +0100 (CET) Subject: [py-svn] r37112 - in py/branch/config/py/test: . testing Message-ID: <20070122000711.8752D1007E@code0.codespeak.net> Author: hpk Date: Mon Jan 22 01:07:09 2007 New Revision: 37112 Modified: py/branch/config/py/test/collect.py py/branch/config/py/test/config.py py/branch/config/py/test/testing/test_config.py Log: * moving towards a common rootdir/root collector * adding an xxxed test Modified: py/branch/config/py/test/collect.py ============================================================================== --- py/branch/config/py/test/collect.py (original) +++ py/branch/config/py/test/collect.py Mon Jan 22 01:07:09 2007 @@ -165,9 +165,10 @@ namelist = namelist.split("/") cur = self for name in namelist: - next = cur.join(name) - assert next is not None, (cur, name, namelist) - cur = next + if name: + next = cur.join(name) + assert next is not None, (cur, name, namelist) + cur = next return cur def haskeyword(self, keyword): Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Mon Jan 22 01:07:09 2007 @@ -63,17 +63,18 @@ def _getcollector(self, path): assert path.check(), "%s: path does not exist" %(path,) + rootcol = self._getrootcollector(path) + return rootcol.getitembynames( + path.relto(rootcol.fspath).split(path.sep)) + + def _getrootcollector(self, path): pkgpath = path.pypkgpath() if pkgpath is None: pkgpath = path.check(file=1) and path.dirpath() or path col = self.conftest.rget("Directory", pkgpath)(pkgpath) col.config = self - for name in path.relto(pkgpath).split(path.sep): - if name: - col = col.join(name) - assert col is not None, ( - "joining %r to collector %s resulted in None" %(name, col)) return col + def addoptions(self, groupname, *specs): """ add a named group of options to the current testing session. Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Mon Jan 22 01:07:09 2007 @@ -83,6 +83,32 @@ config = py.test.config._reparse([str(o)]) assert config.getvalue('x') == 1 +def XXXtest_config_init_direct(): + tmp = py.test.ensuretemp("reprconfig1") + tmp.ensure("__init__.py") + tmp.ensure("conftest.py").write("x=1 ; y=2") + hello = tmp.ensure("test_hello.py") + config = py.test.config._reparse([hello]) + repr = config.repr_direct(conftestnames='x,y') + config2 = py.test.config._reparse([tmp.dirpath()]) + config2.init_direct(repr, basedir=tmp.dirpath()) + for x,y in zip(config.args, config2.args): + assert x == y + py.test.raises(AssertionError, "config2.init_direct(repr, basedir=None)") + config3 = py.test.config._reparse([tmp.dirpath()]) + col = config3._getcollector(hello) + config3.init_direct(repr, basedir=tmp.dirpath(), + collectspecs=[col.gettrail()]) + assert config3.getvalue('x') == 1 + assert config3.getvalue('y') == 2 + cols = config.getcolitems() + assert len(cols) == 1 + col = cols[0] + assert col.name == 'test_hello.py' + assert col.parent.name == 'reprconfig1' + assert col.parent.parent.name == tmp.dirpath().basename + assert col.parent.parent.parent is None + def test_config_make_and_merge_repr(): tmp = py.test.ensuretemp("reprconfig1") tmp.ensure("__init__.py") From hpk at codespeak.net Mon Jan 22 02:20:31 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Mon, 22 Jan 2007 02:20:31 +0100 (CET) Subject: [py-svn] r37114 - in py/branch/config/py/test: . terminal testing Message-ID: <20070122012031.E6A781007A@code0.codespeak.net> Author: hpk Date: Mon Jan 22 02:20:30 2007 New Revision: 37114 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/terminal/remote.py py/branch/config/py/test/testing/test_config.py Log: streamlining initial construction of collectors (to unify topdir/pkgdir/collector handling in rsession/terminal/normal) still work in-progress with a skipped test Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Mon Jan 22 02:20:30 2007 @@ -49,23 +49,33 @@ self.option.__dict__.update(vars(cmdlineoption)) fixoptions(self.option) # XXX fixing should be moved to sessions if not args: - args.append(py.std.os.getcwd()) + args.append(py.std.os.getcwd()) + args = [py.path.local(x) for x in args] + self.topdir = reduce(py.path.local.common, args) self.args = args + def initdirect(self, topdir, repr, coltrails=None): + assert not self._initialized + self._initialized = True + self.merge_repr(repr) + self.topdir = topdir + self.args = coltrails or [] + def getcolitems(self): """ return initial collectors. """ - colitems = [] - if self.args: - for path in self.args: - path = py.path.local(path) - colitems.append(self._getcollector(path)) - return colitems + return [self._getcollector(path) for path in self.args] def _getcollector(self, path): - assert path.check(), "%s: path does not exist" %(path,) - rootcol = self._getrootcollector(path) - return rootcol.getitembynames( - path.relto(rootcol.fspath).split(path.sep)) + if isinstance(path, tuple): + relpath, names = path + fspath = self.topdir.join(relpath) + col = self._getcollector(fspath) + else: + path = py.path.local(path) + assert path.check(), "%s: path does not exist" %(path,) + col = self._getrootcollector(path) + names = path.relto(col.fspath).split(path.sep) + return col.getitembynames(names) def _getrootcollector(self, path): pkgpath = path.pypkgpath() @@ -74,7 +84,6 @@ col = self.conftest.rget("Directory", pkgpath)(pkgpath) col.config = self return col - def addoptions(self, groupname, *specs): """ add a named group of options to the current testing session. Modified: py/branch/config/py/test/terminal/remote.py ============================================================================== --- py/branch/config/py/test/terminal/remote.py (original) +++ py/branch/config/py/test/terminal/remote.py Mon Jan 22 02:20:30 2007 @@ -117,7 +117,7 @@ """, stdout=self.out, stderr=self.out) print "MASTER: triggered slave terminal session ->" repr = self.config.make_repr(conftestnames=[]) - channel.send((repr, self.config.args, failures)) + channel.send((repr, [str(x) for x in self.config.args], failures)) print "MASTER: send start info" try: return channel.receive() Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Mon Jan 22 02:20:30 2007 @@ -83,29 +83,41 @@ config = py.test.config._reparse([str(o)]) assert config.getvalue('x') == 1 -def XXXtest_config_init_direct(): - tmp = py.test.ensuretemp("reprconfig1") +def test_topdir(): + tmp = py.test.ensuretemp("topdir") + config = py.test.config._reparse([tmp]) + assert config.topdir == tmp + config = py.test.config._reparse([tmp.join('hello'), + tmp.join("world")]) + assert config.topdir == tmp + +def test_config_init_direct(): + py.test.skip("XXX partially not implemented") + tmp = py.test.ensuretemp("initdirect") tmp.ensure("__init__.py") tmp.ensure("conftest.py").write("x=1 ; y=2") hello = tmp.ensure("test_hello.py") config = py.test.config._reparse([hello]) - repr = config.repr_direct(conftestnames='x,y') + repr = config.make_repr(conftestnames=['x', 'y']) config2 = py.test.config._reparse([tmp.dirpath()]) - config2.init_direct(repr, basedir=tmp.dirpath()) - for x,y in zip(config.args, config2.args): - assert x == y - py.test.raises(AssertionError, "config2.init_direct(repr, basedir=None)") + config2._initialized = False # we have to do that from tests + config2.initdirect(topdir=tmp.dirpath(), repr=repr) + for col1, col2 in zip(config.getcolitems(), config2.getcolitems()): + assert col1.fspath == col2.fspath + py.test.raises(AssertionError, "config2.initdirect(None, None)") config3 = py.test.config._reparse([tmp.dirpath()]) col = config3._getcollector(hello) - config3.init_direct(repr, basedir=tmp.dirpath(), - collectspecs=[col.gettrail()]) + # XXX write repr_colspecs(topdir, cols), + # and have it consumable by initdirect() + config3.initdirect(topdir=tmp.dirpath(), repr=repr, + collectspecs=[col.listnames()]) assert config3.getvalue('x') == 1 assert config3.getvalue('y') == 2 cols = config.getcolitems() assert len(cols) == 1 col = cols[0] assert col.name == 'test_hello.py' - assert col.parent.name == 'reprconfig1' + assert col.parent.name == tmp.basename assert col.parent.parent.name == tmp.dirpath().basename assert col.parent.parent.parent is None From fijal at codespeak.net Mon Jan 22 13:48:35 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 13:48:35 +0100 (CET) Subject: [py-svn] r37127 - py/branch/config/py/test/rsession Message-ID: <20070122124835.BC0E110088@code0.codespeak.net> Author: fijal Date: Mon Jan 22 13:48:33 2007 New Revision: 37127 Modified: py/branch/config/py/test/rsession/rsession.py Log: Add a few docstrings. Modified: py/branch/config/py/test/rsession/rsession.py ============================================================================== --- py/branch/config/py/test/rsession/rsession.py (original) +++ py/branch/config/py/test/rsession/rsession.py Mon Jan 22 13:48:33 2007 @@ -52,6 +52,10 @@ getpkgdir = staticmethod(getpkgdir) def init_reporter(self, reporter, sshhosts, reporter_class, arg=""): + """ This initialises so called `reporter` class, which will + handle all event presenting to user. Does not get called + if main received custom reporter + """ startserverflag = self.config.option.startserver restflag = self.config.option.restreport @@ -96,6 +100,8 @@ reporterror = staticmethod(reporterror) def kill_server(self, startserverflag): + """ Kill web server + """ if startserverflag: from py.__.test.rsession.web import kill_server kill_server() @@ -118,6 +124,8 @@ return new_reporter, checkfun def parse_directories(sshhosts): + """ Parse sshadresses of hosts to have distinct hostname/hostdir + """ directories = {} for host in sshhosts: m = re.match("^(.*?):(.*)$", host.hostname) @@ -177,6 +185,8 @@ raise def read_distributed_config(self): + """ Read from conftest file the configuration of distributed testing + """ try: rsync_roots = self.config.getvalue("distrsync_roots") except: From fijal at codespeak.net Mon Jan 22 13:58:31 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 13:58:31 +0100 (CET) Subject: [py-svn] r37128 - py/branch/config/py/execnet Message-ID: <20070122125831.A617910088@code0.codespeak.net> Author: fijal Date: Mon Jan 22 13:58:29 2007 New Revision: 37128 Removed: py/branch/config/py/execnet/rsync.py Log: Seems like an old file, will rather move rsync from rsession here. Deleted: /py/branch/config/py/execnet/rsync.py ============================================================================== --- /py/branch/config/py/execnet/rsync.py Mon Jan 22 13:58:29 2007 +++ (empty file) @@ -1,162 +0,0 @@ -import py, md5 - - -def rsync(gw, sourcedir, destdir, **options): - for name in options: - assert name in ('delete',) - - channel = gw.remote_exec(""" - import os, stat, shutil, md5 - destdir, options = channel.receive() - modifiedfiles = [] - - def remove(path): - assert path.startswith(destdir) - try: - os.unlink(path) - except OSError: - # assume it's a dir - shutil.rmtree(path) - - def receive_directory_structure(path, relcomponents): - #print "receive directory structure", path - try: - st = os.lstat(path) - except OSError: - st = None - msg = channel.receive() - if isinstance(msg, list): - if st and not stat.S_ISDIR(st.st_mode): - os.unlink(path) - st = None - if not st: - os.mkdir(path) - entrynames = {} - for entryname in msg: - receive_directory_structure(os.path.join(path, entryname), - relcomponents + [entryname]) - entrynames[entryname] = True - if options.get('delete'): - for othername in os.listdir(path): - if othername not in entrynames: - otherpath = os.path.join(path, othername) - remove(otherpath) - else: - if st and stat.S_ISREG(st.st_mode): - f = file(path, 'rb') - data = f.read() - f.close() - mychecksum = md5.md5(data).digest() - else: - if st: - remove(path) - mychecksum = None - if mychecksum != msg: - channel.send(relcomponents) - modifiedfiles.append(path) - receive_directory_structure(destdir, []) - channel.send(None) # end marker - for path in modifiedfiles: - data = channel.receive() - f = open(path, 'wb') - f.write(data) - f.close() - """) - - channel.send((str(destdir), options)) - - def send_directory_structure(path): - if path.check(dir=1): - subpaths = path.listdir() - print "sending directory structure", path - channel.send([p.basename for p in subpaths]) - for p in subpaths: - send_directory_structure(p) - elif path.check(file=1): - data = path.read() - checksum = md5.md5(data).digest() - channel.send(checksum) - else: - raise ValueError, "cannot sync %r" % (path,) - send_directory_structure(sourcedir) - while True: - modified_rel_path = channel.receive() - if modified_rel_path is None: - break - modifiedpath = sourcedir.join(*modified_rel_path) - data = modifiedpath.read() - channel.send(data) - channel.waitclose() - -def copy(gw, source, dest): - channel = gw.remote_exec(""" - import md5 - localfilename = channel.receive() - try: - f = file(localfilename, 'rb') - existingdata = f.read() - f.close() - except (IOError, OSError): - mycrc = None - else: - mycrc = md5.md5(existingdata).digest() - remotecrc = channel.receive() - if remotecrc == mycrc: - channel.send(None) - else: - channel.send(localfilename) - newdata = channel.receive() - f = file(localfilename, 'wb') - f.write(newdata) - f.close() - """) - channel.send(str(dest)) - f = file(str(source), 'rb') - localdata = f.read() - f.close() - channel.send(md5.md5(localdata).digest()) - status = channel.receive() - if status is not None: - assert status == str(dest) # for now - channel.send(localdata) - channel.waitclose() - - -def setup_module(mod): - mod.gw = py.execnet.PopenGateway() - -def teardown_module(mod): - mod.gw.exit() - - -def test_filecopy(): - dir = py.test.ensuretemp('filecopy') - source = dir.ensure('source') - dest = dir.join('dest') - source.write('hello world') - copy(gw, source, dest) - assert dest.check(file=1) - assert dest.read() == 'hello world' - source.write('something else') - copy(gw, source, dest) - assert dest.check(file=1) - assert dest.read() == 'something else' - -def test_dirsync(): - base = py.test.ensuretemp('dirsync') - dest = base.join('dest') - source = base.mkdir('source') - - for s in ('content1', 'content2'): - source.ensure('subdir', 'file1').write(s) - rsync(gw, source, dest) - assert dest.join('subdir').check(dir=1) - assert dest.join('subdir', 'file1').check(file=1) - assert dest.join('subdir', 'file1').read() == s - - source.join('subdir').remove('file1') - rsync(gw, source, dest) - assert dest.join('subdir', 'file1').check(file=1) - rsync(gw, source, dest, delete=True) - assert not dest.join('subdir', 'file1').check() - From fijal at codespeak.net Mon Jan 22 14:04:05 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 14:04:05 +0100 (CET) Subject: [py-svn] r37129 - in py/branch/config/py: . execnet execnet/testing test/rsession test/rsession/testing Message-ID: <20070122130405.EFF4810088@code0.codespeak.net> Author: fijal Date: Mon Jan 22 14:04:00 2007 New Revision: 37129 Added: py/branch/config/py/execnet/rsync.py - copied unchanged from r37125, py/branch/config/py/test/rsession/rsync.py py/branch/config/py/execnet/rsync_remote.py - copied unchanged from r37125, py/branch/config/py/test/rsession/rsync_remote.py py/branch/config/py/execnet/testing/test_rsync.py - copied unchanged from r37125, py/branch/config/py/test/rsession/testing/test_rsync.py Removed: py/branch/config/py/test/rsession/rsync.py py/branch/config/py/test/rsession/rsync_remote.py py/branch/config/py/test/rsession/testing/test_rsync.py Modified: py/branch/config/py/__init__.py py/branch/config/py/test/rsession/hostmanage.py Log: Move rsync to execnet and expose it as py.execnet.RSync Modified: py/branch/config/py/__init__.py ============================================================================== --- py/branch/config/py/__init__.py (original) +++ py/branch/config/py/__init__.py Mon Jan 22 14:04:00 2007 @@ -91,6 +91,9 @@ 'execnet.PopenGateway' : ('./execnet/register.py', 'PopenGateway'), 'execnet.SshGateway' : ('./execnet/register.py', 'SshGateway'), + # execnet scripts + 'execnet.RSync' : ('./execnet/rsync.py', 'RSync'), + # input-output helping 'io.dupfile' : ('./io/dupfile.py', 'dupfile'), 'io.FDCapture' : ('./io/capture.py', 'FDCapture'), Modified: py/branch/config/py/test/rsession/hostmanage.py ============================================================================== --- py/branch/config/py/test/rsession/hostmanage.py (original) +++ py/branch/config/py/test/rsession/hostmanage.py Mon Jan 22 14:04:00 2007 @@ -5,7 +5,6 @@ from py.__.test.rsession.master import \ setup_slave, MasterNode from py.__.test.rsession import report -from py.__.test.rsession.rsync import RSync class HostInfo(object): """ Class trying to store all necessary attributes @@ -39,11 +38,11 @@ def __ne__(self, other): return not self == other -class HostRSync(RSync): +class HostRSync(py.execnet.RSync): """ An rsync wrapper which filters out *~, .svn/ and *.pyc """ def __init__(self, rsync_roots): - RSync.__init__(self, delete=True) + py.execnet.RSync.__init__(self, delete=True) self.rsync_roots = rsync_roots def filter(self, path): Deleted: /py/branch/config/py/test/rsession/rsync.py ============================================================================== --- /py/branch/config/py/test/rsession/rsync.py Mon Jan 22 14:04:00 2007 +++ (empty file) @@ -1,137 +0,0 @@ -import py, os, stat, md5 -from Queue import Queue - - -class RSync(object): - - def __init__(self, callback=None, **options): - for name in options: - assert name in ('delete') - self.options = options - self.callback = callback - self.channels = {} - self.receivequeue = Queue() - self.links = [] - - def filter(self, path): - return True - - def add_target(self, gateway, destdir, finishedcallback=None): - def itemcallback(req): - self.receivequeue.put((channel, req)) - channel = gateway.remote_exec(REMOTE_SOURCE) - channel.setcallback(itemcallback, endmarker = None) - channel.send((str(destdir), self.options)) - self.channels[channel] = finishedcallback - - def send(self, sourcedir): - self.sourcedir = str(sourcedir) - # normalize a trailing '/' away - self.sourcedir = os.path.dirname(os.path.join(self.sourcedir, 'x')) - # send directory structure and file timestamps/sizes - self._send_directory_structure(self.sourcedir) - - # paths and to_send are only used for doing - # progress-related callbacks - self.paths = {} - self.to_send = {} - - # send modified file to clients - while self.channels: - channel, req = self.receivequeue.get() - if req is None: - # end-of-channel - if channel in self.channels: - # too early! we must have got an error - channel.waitclose() - # or else we raise one - raise IOError('connection unexpectedly closed: %s ' % ( - channel.gateway,)) - else: - command, data = req - if command == "links": - for link in self.links: - channel.send(link) - # completion marker, this host is done - channel.send(42) - elif command == "done": - finishedcallback = self.channels.pop(channel) - if finishedcallback: - finishedcallback() - elif command == "ack": - if self.callback: - self.callback("ack", self.paths[data], channel) - elif command == "list_done": - # sum up all to send - if self.callback: - s = sum([self.paths[i] for i in self.to_send[channel]]) - self.callback("list", s, channel) - elif command == "send": - modified_rel_path, checksum = data - modifiedpath = os.path.join(self.sourcedir, *modified_rel_path) - f = open(modifiedpath, 'rb') - data = f.read() - - # provide info to progress callback function - modified_rel_path = "/".join(modified_rel_path) - self.paths[modified_rel_path] = len(data) - if channel not in self.to_send: - self.to_send[channel] = [] - self.to_send[channel].append(modified_rel_path) - - f.close() - if checksum is not None and checksum == md5.md5(data).digest(): - data = None # not really modified - else: - # ! there is a reason for the interning: - # sharing multiple copies of the file's data - data = intern(data) - print '%s <= %s' % ( - channel.gateway._getremoteaddress(), - modified_rel_path) - channel.send(data) - del data - else: - assert "Unknown command %s" % command - - def _broadcast(self, msg): - for channel in self.channels: - channel.send(msg) - - def _send_link(self, basename, linkpoint): - self.links.append(("link", basename, linkpoint)) - - def _send_directory_structure(self, path): - st = os.lstat(path) - if stat.S_ISREG(st.st_mode): - # regular file: send a timestamp/size pair - self._broadcast((st.st_mtime, st.st_size)) - elif stat.S_ISDIR(st.st_mode): - # dir: send a list of entries - names = [] - subpaths = [] - for name in os.listdir(path): - p = os.path.join(path, name) - if self.filter(p): - names.append(name) - subpaths.append(p) - self._broadcast(names) - for p in subpaths: - self._send_directory_structure(p) - elif stat.S_ISLNK(st.st_mode): - linkpoint = os.readlink(path) - basename = path[len(self.sourcedir) + 1:] - if not linkpoint.startswith(os.sep): - # relative link, just send it - self._send_link(basename, linkpoint) - elif linkpoint.startswith(self.sourcedir): - self._send_link(basename, linkpoint[len(self.sourcedir) + 1:]) - else: - self._send_link(basename, linkpoint) - self._broadcast(None) - else: - raise ValueError, "cannot sync %r" % (path,) - -REMOTE_SOURCE = py.path.local(__file__).dirpath().\ - join('rsync_remote.py').open().read() + "\nf()" - Deleted: /py/branch/config/py/test/rsession/rsync_remote.py ============================================================================== --- /py/branch/config/py/test/rsession/rsync_remote.py Mon Jan 22 14:04:00 2007 +++ (empty file) @@ -1,86 +0,0 @@ - -def f(): - import os, stat, shutil, md5 - destdir, options = channel.receive() - modifiedfiles = [] - - def remove(path): - assert path.startswith(destdir) - try: - os.unlink(path) - except OSError: - # assume it's a dir - shutil.rmtree(path) - - def receive_directory_structure(path, relcomponents): - try: - st = os.lstat(path) - except OSError: - st = None - msg = channel.receive() - if isinstance(msg, list): - if st and not stat.S_ISDIR(st.st_mode): - os.unlink(path) - st = None - if not st: - os.makedirs(path) - entrynames = {} - for entryname in msg: - receive_directory_structure(os.path.join(path, entryname), - relcomponents + [entryname]) - entrynames[entryname] = True - if options.get('delete'): - for othername in os.listdir(path): - if othername not in entrynames: - otherpath = os.path.join(path, othername) - remove(otherpath) - elif msg is not None: - checksum = None - if st: - if stat.S_ISREG(st.st_mode): - msg_mtime, msg_size = msg - if msg_size != st.st_size: - pass - elif msg_mtime != st.st_mtime: - f = open(path, 'rb') - checksum = md5.md5(f.read()).digest() - f.close() - else: - return # already fine - else: - remove(path) - channel.send(("send", (relcomponents, checksum))) - modifiedfiles.append((path, msg)) - receive_directory_structure(destdir, []) - - STRICT_CHECK = False # seems most useful this way for py.test - channel.send(("list_done", None)) - - for path, (time, size) in modifiedfiles: - data = channel.receive() - channel.send(("ack", path[len(destdir) + 1:])) - if data is not None: - if STRICT_CHECK and len(data) != size: - raise IOError('file modified during rsync: %r' % (path,)) - f = open(path, 'wb') - f.write(data) - f.close() - os.utime(path, (time, time)) - del data - channel.send(("links", None)) - - msg = channel.receive() - while msg is not 42: - # we get symlink - _type, relpath, linkpoint = msg - assert _type == "link" - path = os.path.join(destdir, relpath) - try: - remove(path) - except OSError: - pass - - os.symlink(os.path.join(destdir, linkpoint), path) - msg = channel.receive() - channel.send(("done", None)) - Deleted: /py/branch/config/py/test/rsession/testing/test_rsync.py ============================================================================== --- /py/branch/config/py/test/rsession/testing/test_rsync.py Mon Jan 22 14:04:00 2007 +++ (empty file) @@ -1,80 +0,0 @@ -import py -from py.__.test.rsession.rsync import RSync - - -def setup_module(mod): - mod.gw = py.execnet.PopenGateway() - mod.gw2 = py.execnet.PopenGateway() - -def teardown_module(mod): - mod.gw.exit() - mod.gw2.exit() - - -def test_dirsync(): - base = py.test.ensuretemp('dirsync') - dest = base.join('dest') - dest2 = base.join('dest2') - source = base.mkdir('source') - - for s in ('content1', 'content2-a-bit-longer'): - source.ensure('subdir', 'file1').write(s) - rsync = RSync() - rsync.add_target(gw, dest) - rsync.add_target(gw2, dest2) - rsync.send(source) - assert dest.join('subdir').check(dir=1) - assert dest.join('subdir', 'file1').check(file=1) - assert dest.join('subdir', 'file1').read() == s - assert dest2.join('subdir').check(dir=1) - assert dest2.join('subdir', 'file1').check(file=1) - assert dest2.join('subdir', 'file1').read() == s - - source.join('subdir').remove('file1') - rsync = RSync() - rsync.add_target(gw2, dest2) - rsync.add_target(gw, dest) - rsync.send(source) - assert dest.join('subdir', 'file1').check(file=1) - assert dest2.join('subdir', 'file1').check(file=1) - rsync = RSync(delete=True) - rsync.add_target(gw2, dest2) - rsync.add_target(gw, dest) - rsync.send(source) - assert not dest.join('subdir', 'file1').check() - assert not dest2.join('subdir', 'file1').check() - -def test_symlink_rsync(): - if py.std.sys.platform == 'win32': - py.test.skip("symlinks are unsupported on Windows.") - base = py.test.ensuretemp('symlinkrsync') - dest = base.join('dest') - source = base.join('source') - source.ensure("existant") - source.join("rellink").mksymlinkto(source.join("existant"), absolute=0) - source.join('abslink').mksymlinkto(source.join("existant")) - - rsync = RSync() - rsync.add_target(gw, dest) - rsync.send(source) - - assert dest.join('rellink').readlink() == dest.join("existant") - assert dest.join('abslink').readlink() == dest.join("existant") - -def test_callback(): - base = py.test.ensuretemp('callback') - dest = base.join("dest") - source = base.join("source") - source.ensure("existant").write("a" * 100) - source.ensure("existant2").write("a" * 10) - total = {} - def callback(cmd, lgt, channel): - total[(cmd, lgt)] = True - - rsync = RSync(callback=callback) - #rsync = RSync() - rsync.add_target(gw, dest) - rsync.send(source) - - assert total == {("list", 110):True, ("ack", 100):True, ("ack", 10):True} - From fijal at codespeak.net Mon Jan 22 14:10:43 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 14:10:43 +0100 (CET) Subject: [py-svn] r37130 - py/branch/config/py/execnet Message-ID: <20070122131043.4E9A11008A@code0.codespeak.net> Author: fijal Date: Mon Jan 22 14:10:41 2007 New Revision: 37130 Modified: py/branch/config/py/execnet/rsync.py Log: add docstrings. Modified: py/branch/config/py/execnet/rsync.py ============================================================================== --- py/branch/config/py/execnet/rsync.py (original) +++ py/branch/config/py/execnet/rsync.py Mon Jan 22 14:10:41 2007 @@ -3,7 +3,19 @@ class RSync(object): + """ This is an example usage of py.execnet - a sample RSync + protocol, which can perform syncing 1-to-n. + Sample usage: you instantiate this class, eventually providing a + callback when rsyncing is done, than add some targets + (gateway + destdir) by running add_target and finally + invoking send() which will send provided source tree remotely. + + There is limited support for symlinks, which means that symlinks + pointing to the sourcetree will be send "as is" while external + symlinks will be just copied (regardless of existance of such + a path on remote side) + """ def __init__(self, callback=None, **options): for name in options: assert name in ('delete') @@ -17,6 +29,8 @@ return True def add_target(self, gateway, destdir, finishedcallback=None): + """ Adds a target for to-be-send data + """ def itemcallback(req): self.receivequeue.put((channel, req)) channel = gateway.remote_exec(REMOTE_SOURCE) @@ -25,6 +39,8 @@ self.channels[channel] = finishedcallback def send(self, sourcedir): + """ Sends a sourcedir to previously prepared targets + """ self.sourcedir = str(sourcedir) # normalize a trailing '/' away self.sourcedir = os.path.dirname(os.path.join(self.sourcedir, 'x')) From fijal at codespeak.net Mon Jan 22 14:11:14 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 14:11:14 +0100 (CET) Subject: [py-svn] r37131 - py/branch/config/py/execnet/testing Message-ID: <20070122131114.996221008B@code0.codespeak.net> Author: fijal Date: Mon Jan 22 14:11:13 2007 New Revision: 37131 Modified: py/branch/config/py/execnet/testing/test_rsync.py Log: Fix a test Modified: py/branch/config/py/execnet/testing/test_rsync.py ============================================================================== --- py/branch/config/py/execnet/testing/test_rsync.py (original) +++ py/branch/config/py/execnet/testing/test_rsync.py Mon Jan 22 14:11:13 2007 @@ -1,5 +1,5 @@ import py -from py.__.test.rsession.rsync import RSync +from py.execnet import RSync def setup_module(mod): From fijal at codespeak.net Mon Jan 22 14:12:12 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 14:12:12 +0100 (CET) Subject: [py-svn] r37132 - py/branch/config/py/doc Message-ID: <20070122131212.5B90E1008A@code0.codespeak.net> Author: fijal Date: Mon Jan 22 14:12:11 2007 New Revision: 37132 Modified: py/branch/config/py/doc/TODO.txt Log: Remove done issues. Modified: py/branch/config/py/doc/TODO.txt ============================================================================== --- py/branch/config/py/doc/TODO.txt (original) +++ py/branch/config/py/doc/TODO.txt Mon Jan 22 14:12:11 2007 @@ -95,11 +95,7 @@ distributed testing ---------------------- -* the main rsession methods should have docstrings - explaining the purpose - -* move RSync class to py.execnet.RSync, document its usage and - features in the class and method docstrings +Should be done. code quality ----------------- From fijal at codespeak.net Mon Jan 22 14:15:54 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 14:15:54 +0100 (CET) Subject: [py-svn] r37133 - py/branch/config/py/doc Message-ID: <20070122131554.1C5B71008A@code0.codespeak.net> Author: fijal Date: Mon Jan 22 14:15:53 2007 New Revision: 37133 Modified: py/branch/config/py/doc/TODO.txt Log: another update what has been done. Modified: py/branch/config/py/doc/TODO.txt ============================================================================== --- py/branch/config/py/doc/TODO.txt (original) +++ py/branch/config/py/doc/TODO.txt Mon Jan 22 14:15:53 2007 @@ -87,8 +87,6 @@ - running "py.test --looponfailing" - running "py.test" distributed on some hosts -* tests should not create any tempdirectories in the source code base - * try to be as 2.2 compatible as possible (use e.g. py.builtin.enumerate instead of "enumerate" directly) From guido at codespeak.net Mon Jan 22 16:07:56 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Mon, 22 Jan 2007 16:07:56 +0100 (CET) Subject: [py-svn] r37145 - in py/dist/py/apigen: . testing Message-ID: <20070122150756.E88571008A@code0.codespeak.net> Author: guido Date: Mon Jan 22 16:07:54 2007 New Revision: 37145 Modified: py/dist/py/apigen/htmlgen.py py/dist/py/apigen/testing/test_apigen_example.py py/dist/py/apigen/testing/test_apigen_functional.py Log: Displaying arguments in a nicer fashion, displaying argument and return value types, renamed the main namespace in the tests to 'main' to avoid confusion. Modified: py/dist/py/apigen/htmlgen.py ============================================================================== --- py/dist/py/apigen/htmlgen.py (original) +++ py/dist/py/apigen/htmlgen.py Mon Jan 22 16:07:54 2007 @@ -11,21 +11,7 @@ html = py.xml.html raw = py.xml.raw -def create_namespace_tree(dotted_names): - """ creates a tree (in dict form) from a set of dotted names - """ - ret = {} - for dn in dotted_names: - path = dn.split('.') - for i in xrange(len(path)): - ns = '.'.join(path[:i]) - itempath = '.'.join(path[:i + 1]) - if ns not in ret: - ret[ns] = [] - if itempath not in ret[ns]: - ret[ns].append(itempath) - return ret - +# HTML related stuff class H(html): class Description(html.div): style = html.Style(margin_left='10em') @@ -51,6 +37,12 @@ class MethodDef(html.h2): pass + class FunctionDescription(Description): + pass + + class FunctionDef(html.h2): + pass + class ParameterDescription(html.div): pass @@ -78,6 +70,14 @@ class DirListItem(html.div): pass + class ValueDescList(html.ul): + def __init__(self, *args, **kwargs): + super(H.ValueDescList, self).__init__(*args, **kwargs) + self.insert(0, html.div('where:')) + + class ValueDescItem(html.li): + pass + def get_param_htmldesc(linker, func): """ get the html for the parameters of a function """ import inspect @@ -91,6 +91,7 @@ navitem.attr.class_ = 'selected' return navitem +# some helper functionality def source_dirs_files(fspath): """ returns a tuple (dirs, files) for fspath @@ -114,6 +115,32 @@ files.append(child) return sorted(dirs), sorted(files) +def create_namespace_tree(dotted_names): + """ creates a tree (in dict form) from a set of dotted names + """ + ret = {} + for dn in dotted_names: + path = dn.split('.') + for i in xrange(len(path)): + ns = '.'.join(path[:i]) + itempath = '.'.join(path[:i + 1]) + if ns not in ret: + ret[ns] = [] + if itempath not in ret[ns]: + ret[ns].append(itempath) + return ret + +def wrap_page(project, title, contentel, navel, outputpath, stylesheeturl): + page = LayoutPage(project, title, nav=navel, encoding='UTF-8', + stylesheeturl=stylesheeturl) + page.set_content(contentel) + here = py.magic.autopath().dirpath() + style = here.join('style.css').read() + outputpath.join('style.css').write(style) + return page + +# the PageBuilder classes take care of producing the docs (using the stuff +# above) class AbstractPageBuilder(object): def write_page(self, title, reltargetpath, project, tag, nav): targetpath = self.base.join(reltargetpath) @@ -257,36 +284,38 @@ self.linker = linker self.dsa = dsa - def build_full_method_view(self, dotted_name): + def build_callable_view(self, dotted_name): """ build the html for a class method """ + # XXX we may want to have seperate func = self.dsa.get_obj(dotted_name) sourcefile = inspect.getsourcefile(func) - params = get_param_htmldesc(self.linker, func) docstring = func.__doc__ local_methodname = func.__name__ + argdesc = get_param_htmldesc(self.linker, func) + valuedesc = self.build_callable_value_description(dotted_name) + + callable_source = self.dsa.get_function_source(dotted_name) + if callable_source: + csource = H.div(H.br(), + H.div('source:'), + H.SourceDef(H.pre(callable_source))) + else: + csource = H.SourceDef('could not get source') + if sourcefile is not None: - sourcelink = H.a('source', + sourcelink = H.a('view source file', href=self.linker.get_lazyhref(sourcefile)) else: sourcelink = H.span('no source file available') - snippet = H.MethodDescription( - H.MethodDef(local_methodname, params, ":"), - sourcelink, - H.Docstring(docstring), - ) - return snippet - def build_short_method_view(self, dotted_name): - """ build the html for a class method """ - func = self.dsa.get_obj(dotted_name) - params = get_param_htmldesc(self.linker, func) - docstring = func.__doc__ - local_methodname = func.__name__ - snippet = H.MethodDescription( - H.MethodDef(local_methodname, params, ":"), + snippet = H.FunctionDescription( + H.FunctionDef(local_methodname, argdesc), + valuedesc, H.Docstring(docstring), - # XXX more info here... + csource, + sourcelink, ) + return snippet def build_class_view(self, dotted_name): @@ -324,8 +353,8 @@ ) snippet.append(H.h2('Functions:')) for method in methods: - snippet += self.build_short_method_view('%s.%s' % (dotted_name, - method)) + snippet += self.build_callable_view('%s.%s' % (dotted_name, + method)) return snippet def build_namespace_view(self, namespace_dotted_name, item_dotted_names): @@ -383,7 +412,7 @@ parent_dotted_name, _ = split_of_last_part(dotted_name) module_dotted_name, _ = split_of_last_part(parent_dotted_name) sibling_dotted_names = namespace_tree[module_dotted_name] - tag = self.build_full_method_view(dotted_name) + tag = self.build_callable_view(dotted_name) nav = self.build_navigation(parent_dotted_name, sibling_dotted_names, dotted_name) reltargetpath = "api/%s.html" % (dotted_name,) @@ -399,10 +428,10 @@ def prepare_function_pages(self, namespace_tree, method_dotted_names): passed = [] for dotted_name in method_dotted_names: - # XXX should we create a build_full_function_view instead? + # XXX should we create a build_function_view instead? parent_dotted_name, _ = split_of_last_part(dotted_name) sibling_dotted_names = namespace_tree[parent_dotted_name] - tag = self.build_full_method_view(dotted_name) + tag = self.build_callable_view(dotted_name) nav = self.build_navigation(parent_dotted_name, sibling_dotted_names, dotted_name) reltargetpath = "api/%s.html" % (dotted_name,) @@ -437,7 +466,7 @@ def build_namespace_pages(self, data, project): for dotted_name, tag, nav, reltargetpath in data: if dotted_name == '': - dotted_name = 'project root' + dotted_name = self.dsa.get_module_name().split('/')[-1] title = 'index of %s namespace' % (dotted_name,) self.write_page(title, reltargetpath, project, tag, nav) @@ -473,12 +502,43 @@ selected)) return H.Navigation(*navitems) -def wrap_page(project, title, contentel, navel, outputpath, stylesheeturl): - page = LayoutPage(project, title, nav=navel, encoding='UTF-8', - stylesheeturl=stylesheeturl) - page.set_content(contentel) - here = py.magic.autopath().dirpath() - style = here.join('style.css').read() - outputpath.join('style.css').write(style) - return page + def build_callable_value_description(self, dotted_name): + args, retval = self.dsa.get_function_signature(dotted_name) + valuedesc = H.ValueDescList() + for name, _type in args + [('return value', retval)]: + l = self.process_type_link(_type) + items = [] + next = "%s :: " % name + for item in l: + if isinstance(item, str): + next += item + else: + if next: + items.append(next) + next = "" + items.append(item) + if next: + items.append(next) + valuedesc.append(H.ValueDescItem(*items)) + return valuedesc + + def process_type_link(self, _type): + # now we do simple type dispatching and provide a link in this case + lst = [] + data = self.dsa.get_type_desc(_type) + if not data: + for i in _type.striter(): + if isinstance(i, str): + lst.append(i) + else: + lst += self.process_type_link(i) + return lst + name, _desc_type, is_degenerated = data + if not is_degenerated: + linktarget = self.linker.get_lazyhref(name) + lst.append(H.a(str(_type), href=linktarget)) + else: + # we should provide here some way of linking to sourcegen directly + lst.append(name) + return lst Modified: py/dist/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_example.py (original) +++ py/dist/py/apigen/testing/test_apigen_example.py Mon Jan 22 16:07:54 2007 @@ -3,6 +3,7 @@ from py.__.apigen.linker import Linker from py.__.apigen.htmlgen import * from py.__.apigen.tracer.docstorage import DocStorage, DocStorageAccessor +from py.__.apigen.tracer.tracer import Tracer from py.__.apigen.project import Project from py.__.test.web import webcheck from py.__.apigen.conftest import option @@ -17,9 +18,10 @@ else: message = 'unexpected position: %s' % (newpos,) py.test.fail('string %r: %s' % (s, message)) + currpos = newpos -def setup_fs_project(tempname='apigen_example'): - temp = py.test.ensuretemp(tempname) +def setup_fs_project(): + temp = py.test.ensuretemp('apigen_example') temp.ensure("pkg/func.py").write(py.code.Source("""\ def func(arg1): "docstring" @@ -44,9 +46,9 @@ temp.ensure("pkg/__init__.py").write(py.code.Source("""\ from py.initpkg import initpkg initpkg(__name__, exportdefs = { - 'pkg.sub.func': ("./func.py", "func"), - 'pkg.SomeClass': ('./someclass.py', 'SomeClass'), - 'pkg.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), + 'main.sub.func': ("./func.py", "func"), + 'main.SomeClass': ('./someclass.py', 'SomeClass'), + 'main.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), }) """)) return temp, 'pkg' @@ -57,7 +59,7 @@ ds = DocStorage() ds.from_pkg(pkg) dsa = DocStorageAccessor(ds) - return dsa + return ds, dsa def _checkhtml(htmlstring): if isinstance(htmlstring, unicode): @@ -79,7 +81,7 @@ class AbstractBuilderTest(object): def setup_class(cls): cls.fs_root, cls.pkg_name = setup_fs_project() - cls.dsa = get_dsa(cls.fs_root, cls.pkg_name) + cls.ds, cls.dsa = get_dsa(cls.fs_root, cls.pkg_name) cls.project = Project() def setup_method(self, meth): @@ -96,177 +98,194 @@ self.spb = SourcePageBuilder(base, linker, self.fs_root) class TestApiPageBuilder(AbstractBuilderTest): - def test_build_full_method_view(self): - snippet = self.apb.build_full_method_view('pkg.sub.func') + def test_build_callable_view(self): + ds, dsa = get_dsa(self.fs_root, self.pkg_name) + t = Tracer(ds) + t.start_tracing() + pkg = __import__(self.pkg_name) + pkg.main.sub.func(10) + pkg.main.sub.func(pkg.main.SomeClass(10)) + t.end_tracing() + apb = ApiPageBuilder(self.base, self.linker, dsa) + snippet = apb.build_callable_view('main.sub.func') html = snippet.unicode() + print html + run_string_sequence_test(html, [ + 'arg1 :: AnyOf(', + 'href="', + 'Class SomeClass', + 'Int>', + 'return value :: <None>', + 'source:', + 'def func(arg1):', + ]) _checkhtmlsnippet(html) def test_build_function_pages(self): - namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', + 'main.SomeClass', + 'main.SomeSubClass']) data = self.apb.prepare_function_pages(namespace_tree, - ['pkg.sub.func']) + ['main.sub.func']) self.apb.build_function_pages(data, self.project) - funcfile = self.base.join('api/pkg.sub.func.html') + funcfile = self.base.join('api/main.sub.func.html') assert funcfile.check() html = funcfile.read() _checkhtml(html) def test_build_class_view(self): - snippet = self.apb.build_class_view('pkg.SomeClass') + snippet = self.apb.build_class_view('main.SomeClass') html = snippet.unicode() _checkhtmlsnippet(html) def test_build_class_pages(self): - namespace_tree = create_namespace_tree(['pkg.SomeClass', - 'pkg.SomeSubClass', - 'pkg.sub.func']) + namespace_tree = create_namespace_tree(['main.SomeClass', + 'main.SomeSubClass', + 'main.sub.func']) data, methodsdata = self.apb.prepare_class_pages(namespace_tree, - ['pkg.SomeClass', - 'pkg.SomeSubClass']) + ['main.SomeClass', + 'main.SomeSubClass']) self.apb.build_class_pages(data, self.project) - clsfile = self.base.join('api/pkg.SomeClass.html') + clsfile = self.base.join('api/main.SomeClass.html') assert clsfile.check() html = clsfile.read() _checkhtml(html) def test_build_class_pages_nav_links(self): - namespace_tree = create_namespace_tree(['pkg.SomeClass', - 'pkg.SomeSubClass', - 'pkg.sub.func']) + namespace_tree = create_namespace_tree(['main.SomeClass', + 'main.SomeSubClass', + 'main.sub.func']) data, methodsdata = self.apb.prepare_class_pages(namespace_tree, - ['pkg.SomeSubClass', - 'pkg.SomeClass']) + ['main.SomeSubClass', + 'main.SomeClass']) # fake some stuff that would be built from other methods self.linker.set_link('', 'api/index.html') - self.linker.set_link('pkg', 'api/pkg.html') + self.linker.set_link('main', 'api/main.html') self.apb.build_class_pages(data, self.project) - clsfile = self.base.join('api/pkg.SomeClass.html') + clsfile = self.base.join('api/main.SomeClass.html') assert clsfile.check() html = clsfile.read() print html - # note that the root and the first level both have the same name (pkg) - # in our example project (XXX fixme!!) run_string_sequence_test(html, [ 'href="../style.css"', 'href="index.html">pkg', - 'href="pkg.html">pkg', - 'href="pkg.SomeClass.html">SomeClass', - 'href="pkg.SomeSubClass.html">SomeSubClass', + 'href="main.html">main', + 'href="main.SomeClass.html">SomeClass', + 'href="main.SomeSubClass.html">SomeSubClass', ]) - assert not 'href="pkg.sub.func.html"' in html + assert not 'href="main.sub.func.html"' in html py.test.skip('WOP from here') - assert 'href="pkg.sub.html">sub' in html + assert 'href="main.sub.html">sub' in html _checkhtml(html) def test_build_class_pages_base_link(self): - namespace_tree = create_namespace_tree(['pkg.SomeClass', - 'pkg.SomeSubClass', - 'pkg.sub.func']) + namespace_tree = create_namespace_tree(['main.SomeClass', + 'main.SomeSubClass', + 'main.sub.func']) data, methodsdata = self.apb.prepare_class_pages(namespace_tree, - ['pkg.SomeSubClass', - 'pkg.SomeClass']) + ['main.SomeSubClass', + 'main.SomeClass']) self.apb.build_class_pages(data, self.project) - clsfile = self.base.join('api/pkg.SomeSubClass.html') + clsfile = self.base.join('api/main.SomeSubClass.html') assert clsfile.check() html = clsfile.read() print html run_string_sequence_test(html, [ 'href="../style.css"', - 'href="pkg.SomeClass.html">pkg.SomeClass', + 'href="main.SomeClass.html">main.SomeClass', ]) _checkhtml(html) def test_source_links(self): - namespace_tree = create_namespace_tree(['pkg.SomeClass', - 'pkg.SomeSubClass', - 'pkg.sub.func']) + namespace_tree = create_namespace_tree(['main.SomeClass', + 'main.SomeSubClass', + 'main.sub.func']) data, methodsdata = self.apb.prepare_class_pages(namespace_tree, - ['pkg.SomeSubClass', - 'pkg.SomeClass']) + ['main.SomeSubClass', + 'main.SomeClass']) sourcedata = self.spb.prepare_pages(self.fs_root) self.apb.build_class_pages(data, self.project) self.spb.build_pages(sourcedata, self.project, self.fs_root) - funchtml = self.base.join('api/pkg.SomeClass.html').read() + funchtml = self.base.join('api/main.SomeClass.html').read() assert funchtml.find('href="../source/pkg/someclass.py.html"') > -1 _checkhtml(funchtml) def test_build_namespace_pages_index(self): - namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', + 'main.SomeClass', + 'main.SomeSubClass']) data = self.apb.prepare_namespace_pages(namespace_tree) self.apb.prepare_class_pages(namespace_tree, - ['pkg.SomeClass', - 'pkg.SomeSubClass']) - self.apb.prepare_function_pages(namespace_tree, ['pkg.sub.func']) + ['main.SomeClass', + 'main.SomeSubClass']) + self.apb.prepare_function_pages(namespace_tree, ['main.sub.func']) self.apb.build_namespace_pages(data, self.project) - pkgfile = self.base.join('api/pkg.html') + pkgfile = self.base.join('api/index.html') assert pkgfile.check() html = pkgfile.read() + assert 'index of project pkg namespace' _checkhtml(html) def test_build_namespace_pages_subnamespace(self): - namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', + 'main.SomeClass', + 'main.SomeSubClass']) data = self.apb.prepare_namespace_pages(namespace_tree) self.apb.build_namespace_pages(data, self.project) - subfile = self.base.join('api/pkg.sub.html') + subfile = self.base.join('api/main.sub.html') assert subfile.check() html = subfile.read() _checkhtml(html) def test_build_function_api_pages_nav(self): - namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', + 'main.SomeClass', + 'main.SomeSubClass']) data = self.apb.prepare_function_pages(namespace_tree, - ['pkg.sub.func']) + ['main.sub.func']) self.linker.set_link('', 'api/index.html') - self.linker.set_link('pkg', 'api/pkg.html') - self.linker.set_link('pkg.sub', 'api/pkg.sub.html') + self.linker.set_link('main', 'api/main.html') + self.linker.set_link('main.sub', 'api/main.sub.html') self.apb.build_function_pages(data, self.project) - funcfile = self.base.join('api/pkg.sub.func.html') + funcfile = self.base.join('api/main.sub.func.html') html = funcfile.read() print html run_string_sequence_test(html, [ '', - '', - '', - '', + '', + '', + '', ]) _checkhtml(html) def test_build_function_navigation(self): - namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', + 'main.SomeClass', + 'main.SomeSubClass']) self.apb.prepare_namespace_pages(namespace_tree) - self.apb.prepare_function_pages(namespace_tree, ['pkg.sub.func']) - nav = self.apb.build_navigation('pkg.sub', ['pkg.sub.func'], - 'pkg.sub.func') + self.apb.prepare_function_pages(namespace_tree, ['main.sub.func']) + nav = self.apb.build_navigation('main.sub', ['main.sub.func'], + 'main.sub.func') html = nav.unicode(indent=0) print html.encode('UTF-8') assert (u'

pkg

' - u'

\xa0\xa0pkg

' + u'

\xa0\xa0main

' u'

\xa0\xa0\xa0\xa0' - u'sub

' + u'sub' u'

\xa0\xa0\xa0\xa0\xa0\xa0' - u'func

' + u'func' ) in html def test_build_root_namespace_view(self): - namespace_tree = create_namespace_tree(['pkg.sub', 'pkg.sub.func', - 'pkg.SomeClass', - 'pkg.SomeSubClass']) + namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', + 'main.SomeClass', + 'main.SomeSubClass']) data = self.apb.prepare_namespace_pages(namespace_tree) self.apb.build_namespace_pages(data, self.project) rootfile = self.base.join('api/index.html') assert rootfile.check() html = rootfile.read() - assert '' in html + assert '' in html _checkhtml(html) class TestSourcePageBuilder(AbstractBuilderTest): Modified: py/dist/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_functional.py (original) +++ py/dist/py/apigen/testing/test_apigen_functional.py Mon Jan 22 16:07:54 2007 @@ -4,46 +4,106 @@ """ import py -from test_apigen_example import setup_fs_project + +def setup_fs_project(): + temp = py.test.ensuretemp('apigen_functional') + temp.ensure("pkg/func.py").write(py.code.Source("""\ + def func(arg1): + "docstring" + + def func_2(arg1, arg2): + return arg1(arg2) + """)) + temp.ensure('pkg/sometestclass.py').write(py.code.Source("""\ + class SomeTestClass(object): + " docstring sometestclass " + def __init__(self, somevar): + self.somevar = somevar + + def get_somevar(self): + " get_somevar docstring " + return self.somevar + """)) + temp.ensure('pkg/sometestsubclass.py').write(py.code.Source("""\ + from sometestclass import SomeTestClass + class SomeTestSubClass(SomeTestClass): + " docstring sometestsubclass " + def get_somevar(self): + return self.somevar + 1 + """)) + temp.ensure("pkg/__init__.py").write(py.code.Source("""\ + from py.initpkg import initpkg + initpkg(__name__, exportdefs = { + 'main.sub.func': ("./func.py", "func"), + 'main.func': ("./func.py", "func_2"), + 'main.SomeTestClass': ('./sometestclass.py', 'SomeTestClass'), + 'main.SomeTestSubClass': ('./sometestsubclass.py', 'SomeTestSubClass'), + }) + """)) + temp.ensure('pkg/test/test_pkg.py').write(py.code.Source("""\ + import py + py.std.sys.path.insert(0, + py.magic.autopath().dirpath().dirpath().dirpath().strpath) + import pkg + + # this mainly exists to provide some data to the tracer + def test_pkg(): + s = pkg.main.SomeTestClass(10) + assert s.get_somevar() == 10 + s = pkg.main.SomeTestClass('10') + assert s.get_somevar() == '10' + s = pkg.main.SomeTestSubClass(10) + assert s.get_somevar() == 11 + s = pkg.main.SomeTestSubClass('10') + py.test.raises(TypeError, 's.get_somevar()') + assert pkg.main.sub.func(10) is None + assert pkg.main.sub.func(20) is None + s = pkg.main.func(pkg.main.SomeTestClass, 10) + assert isinstance(s, pkg.main.SomeTestClass) + """)) + return temp, 'pkg' def test_apigen_functional(): - fs_root, package_name = setup_fs_project( - 'test_apigen_functional') + fs_root, package_name = setup_fs_project() tempdir = py.test.ensuretemp('test_apigen_functional_results') parentdir = py.magic.autopath().dirpath().dirpath() pkgdir = fs_root.join('pkg') - output = py.process.cmdexec( - 'APIGEN_TARGET="%s" py.test --session=L --apigen="%s/apigen.py" "%s"' % ( - tempdir, parentdir, pkgdir)) + try: + output = py.process.cmdexec('APIGEN_TARGET="%s" py.test --session=L ' + '--apigen="%s/apigen.py" "%s"' % ( + tempdir, parentdir, pkgdir)) + except py.error.Error, e: + print e.out + raise assert output.lower().find('traceback') == -1 # just some quick content checks apidir = tempdir.join('api') assert apidir.check(dir=True) - someclass_api = apidir.join('pkg.SomeClass.html') - assert someclass_api.check(file=True) - html = someclass_api.read() - assert 'SomeClass' in html + sometestclass_api = apidir.join('main.SomeTestClass.html') + assert sometestclass_api.check(file=True) + html = sometestclass_api.read() + assert 'SomeTestClass' in html # XXX not linking to method files anymore - #someclass_init_api = apidir.join('pkg.SomeClass.__init__.html') - #assert someclass_init_api.check(file=True) - #assert someclass_init_api.read().find( - # '__init__') > -1 - namespace_api = apidir.join('pkg.html') + #sometestclass_init_api = apidir.join('main.SomeTestClass.__init__.html') + #assert sometestclass_init_api.check(file=True) + #assert sometestclass_init_api.read().find( + # '__init__') > -1 + namespace_api = apidir.join('main.html') assert namespace_api.check(file=True) html = namespace_api.read() - assert 'SomeClass' in html + assert 'SomeTestClass' in html sourcedir = tempdir.join('source') assert sourcedir.check(dir=True) - someclass_source = sourcedir.join('someclass.py.html') - assert someclass_source.check(file=True) - html = someclass_source.read() - assert '

sources for someclass.py

' in html + sometestclass_source = sourcedir.join('sometestclass.py.html') + assert sometestclass_source.check(file=True) + html = sometestclass_source.read() + assert '

sources for sometestclass.py

' in html # XXX later... #index = sourcedir.join('index.html') #assert index.check(file=True) #html = index.read() - #assert 'pkg' in html + #assert 'main' in html From guido at codespeak.net Mon Jan 22 19:23:08 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Mon, 22 Jan 2007 19:23:08 +0100 (CET) Subject: [py-svn] r37155 - in py/dist/py/apigen: . testing Message-ID: <20070122182308.C99051007C@code0.codespeak.net> Author: guido Date: Mon Jan 22 19:23:07 2007 New Revision: 37155 Modified: py/dist/py/apigen/htmlgen.py py/dist/py/apigen/testing/test_apigen_example.py py/dist/py/apigen/testing/test_apigen_functional.py Log: Some improvements in function HTML, small cleanup in tests (there's now a single create_namespace_tree call done for all the apigen tests). Modified: py/dist/py/apigen/htmlgen.py ============================================================================== --- py/dist/py/apigen/htmlgen.py (original) +++ py/dist/py/apigen/htmlgen.py Mon Jan 22 19:23:07 2007 @@ -288,32 +288,28 @@ """ build the html for a class method """ # XXX we may want to have seperate func = self.dsa.get_obj(dotted_name) - sourcefile = inspect.getsourcefile(func) docstring = func.__doc__ - local_methodname = func.__name__ + localname = func.__name__ argdesc = get_param_htmldesc(self.linker, func) valuedesc = self.build_callable_value_description(dotted_name) - + + sourcefile = inspect.getsourcefile(func) callable_source = self.dsa.get_function_source(dotted_name) - if callable_source: + # i assume they're both either available or unavailable(XXX ?) + if sourcefile and callable_source: csource = H.div(H.br(), - H.div('source:'), + H.a('source:', + href=self.linker.get_lazyhref(sourcefile)), + H.br(), H.SourceDef(H.pre(callable_source))) else: - csource = H.SourceDef('could not get source') - - if sourcefile is not None: - sourcelink = H.a('view source file', - href=self.linker.get_lazyhref(sourcefile)) - else: - sourcelink = H.span('no source file available') + csource = H.SourceDef('could not get source file') snippet = H.FunctionDescription( - H.FunctionDef(local_methodname, argdesc), + H.FunctionDef(localname, argdesc), valuedesc, - H.Docstring(docstring), + H.Docstring(docstring or H.em('no docstring available')), csource, - sourcelink, ) return snippet @@ -321,14 +317,20 @@ def build_class_view(self, dotted_name): """ build the html for a class """ cls = self.dsa.get_obj(dotted_name) + # XXX is this a safe check? try: sourcefile = inspect.getsourcefile(cls) except TypeError: - return H.div('builtin file') - if sourcefile is None: - return H.div('no source available') - if sourcefile[-1] in ['o', 'c']: - sourcefile = sourcefile[:-1] + sourcelink = 'builtin file, no source available' + else: + if sourcefile is None: + sourcelink = H.div('no source available') + else: + if sourcefile[-1] in ['o', 'c']: + sourcefile = sourcefile[:-1] + sourcelink = H.div(H.a('source', + href=self.linker.get_lazyhref(sourcefile))) + docstring = cls.__doc__ methods = self.dsa.get_class_methods(dotted_name) basehtml = [] @@ -345,11 +347,15 @@ if basehtml: basehtml.pop() basehtml.append('):') + if not hasattr(cls, '__name__'): + clsname = 'instance of %s' % (cls.__class__.__name__,) + else: + clsname = cls.__name__ snippet = H.ClassDescription( # XXX bases HTML - H.ClassDef('%s(' % (cls.__name__,), *basehtml), - H.a('source', href=self.linker.get_lazyhref(sourcefile)), - H.Docstring(docstring), + H.ClassDef('%s(' % (clsname,), *basehtml), + sourcelink, + H.Docstring(docstring or H.em('no docstring available')), ) snippet.append(H.h2('Functions:')) for method in methods: @@ -359,6 +365,7 @@ def build_namespace_view(self, namespace_dotted_name, item_dotted_names): """ build the html for a namespace (module) """ + print 'building namespace for', namespace_dotted_name snippet = H.NamespaceDescription( H.NamespaceDef(namespace_dotted_name), ) Modified: py/dist/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_example.py (original) +++ py/dist/py/apigen/testing/test_apigen_example.py Mon Jan 22 19:23:07 2007 @@ -35,6 +35,7 @@ def get_somevar(self): " get_somevar docstring " return self.somevar + SomeInstance = SomeClass(10) """)) temp.ensure('pkg/somesubclass.py').write(py.code.Source("""\ from someclass import SomeClass @@ -43,12 +44,21 @@ def get_somevar(self): return self.somevar + 1 """)) + temp.ensure('pkg/somenamespace.py').write(py.code.Source("""\ + def foo(): + return 'bar' + def baz(qux): + return qux + """)) temp.ensure("pkg/__init__.py").write(py.code.Source("""\ from py.initpkg import initpkg initpkg(__name__, exportdefs = { 'main.sub.func': ("./func.py", "func"), 'main.SomeClass': ('./someclass.py', 'SomeClass'), + 'main.SomeInstance': ('./someclass.py', 'SomeInstance'), + 'main.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), 'main.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), + 'other': ('./somenamespace.py', '*'), }) """)) return temp, 'pkg' @@ -96,6 +106,13 @@ self.linker = linker = LinkerForTests() self.apb = ApiPageBuilder(base, linker, self.dsa) self.spb = SourcePageBuilder(base, linker, self.fs_root) + self.namespace_tree = create_namespace_tree(['main.sub', + 'main.sub.func', + 'main.SomeClass', + 'main.SomeSubClass', + 'main.SomeInstance', + 'other.foo', + 'other.bar']) class TestApiPageBuilder(AbstractBuilderTest): def test_build_callable_view(self): @@ -122,10 +139,7 @@ _checkhtmlsnippet(html) def test_build_function_pages(self): - namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', - 'main.SomeClass', - 'main.SomeSubClass']) - data = self.apb.prepare_function_pages(namespace_tree, + data = self.apb.prepare_function_pages(self.namespace_tree, ['main.sub.func']) self.apb.build_function_pages(data, self.project) funcfile = self.base.join('api/main.sub.func.html') @@ -139,10 +153,7 @@ _checkhtmlsnippet(html) def test_build_class_pages(self): - namespace_tree = create_namespace_tree(['main.SomeClass', - 'main.SomeSubClass', - 'main.sub.func']) - data, methodsdata = self.apb.prepare_class_pages(namespace_tree, + data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, ['main.SomeClass', 'main.SomeSubClass']) self.apb.build_class_pages(data, self.project) @@ -151,11 +162,22 @@ html = clsfile.read() _checkhtml(html) + def test_build_class_pages_instance(self): + data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, + ['main.SomeClass', + 'main.SomeSubClass', + 'main.SomeInstance']) + self.apb.build_class_pages(data, self.project) + clsfile = self.base.join('api/main.SomeInstance.html') + assert clsfile.check() + html = clsfile.read() + print html + run_string_sequence_test(html, [ + 'instance of SomeClass()', + ]) + def test_build_class_pages_nav_links(self): - namespace_tree = create_namespace_tree(['main.SomeClass', - 'main.SomeSubClass', - 'main.sub.func']) - data, methodsdata = self.apb.prepare_class_pages(namespace_tree, + data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, ['main.SomeSubClass', 'main.SomeClass']) # fake some stuff that would be built from other methods @@ -179,10 +201,7 @@ _checkhtml(html) def test_build_class_pages_base_link(self): - namespace_tree = create_namespace_tree(['main.SomeClass', - 'main.SomeSubClass', - 'main.sub.func']) - data, methodsdata = self.apb.prepare_class_pages(namespace_tree, + data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, ['main.SomeSubClass', 'main.SomeClass']) self.apb.build_class_pages(data, self.project) @@ -197,10 +216,7 @@ _checkhtml(html) def test_source_links(self): - namespace_tree = create_namespace_tree(['main.SomeClass', - 'main.SomeSubClass', - 'main.sub.func']) - data, methodsdata = self.apb.prepare_class_pages(namespace_tree, + data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, ['main.SomeSubClass', 'main.SomeClass']) sourcedata = self.spb.prepare_pages(self.fs_root) @@ -210,15 +226,28 @@ assert funchtml.find('href="../source/pkg/someclass.py.html"') > -1 _checkhtml(funchtml) + def test_build_namespace_pages(self): + data = self.apb.prepare_namespace_pages(self.namespace_tree) + self.apb.build_namespace_pages(data, self.project) + mainfile = self.base.join('api/main.html') + assert mainfile.check() + html = mainfile.read() + print html + run_string_sequence_test(html, [ + 'index of main namespace', + ]) + otherfile = self.base.join('api/other.html') + assert otherfile.check() + otherhtml = otherfile.read() + print otherhtml + run_string_sequence_test(otherhtml, [ + 'index of other namespace', + ]) + _checkhtml(html) + _checkhtml(otherhtml) + def test_build_namespace_pages_index(self): - namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', - 'main.SomeClass', - 'main.SomeSubClass']) - data = self.apb.prepare_namespace_pages(namespace_tree) - self.apb.prepare_class_pages(namespace_tree, - ['main.SomeClass', - 'main.SomeSubClass']) - self.apb.prepare_function_pages(namespace_tree, ['main.sub.func']) + data = self.apb.prepare_namespace_pages(self.namespace_tree) self.apb.build_namespace_pages(data, self.project) pkgfile = self.base.join('api/index.html') assert pkgfile.check() @@ -227,10 +256,7 @@ _checkhtml(html) def test_build_namespace_pages_subnamespace(self): - namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', - 'main.SomeClass', - 'main.SomeSubClass']) - data = self.apb.prepare_namespace_pages(namespace_tree) + data = self.apb.prepare_namespace_pages(self.namespace_tree) self.apb.build_namespace_pages(data, self.project) subfile = self.base.join('api/main.sub.html') assert subfile.check() @@ -238,10 +264,7 @@ _checkhtml(html) def test_build_function_api_pages_nav(self): - namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', - 'main.SomeClass', - 'main.SomeSubClass']) - data = self.apb.prepare_function_pages(namespace_tree, + data = self.apb.prepare_function_pages(self.namespace_tree, ['main.sub.func']) self.linker.set_link('', 'api/index.html') self.linker.set_link('main', 'api/main.html') @@ -259,11 +282,8 @@ _checkhtml(html) def test_build_function_navigation(self): - namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', - 'main.SomeClass', - 'main.SomeSubClass']) - self.apb.prepare_namespace_pages(namespace_tree) - self.apb.prepare_function_pages(namespace_tree, ['main.sub.func']) + self.apb.prepare_namespace_pages(self.namespace_tree) + self.apb.prepare_function_pages(self.namespace_tree, ['main.sub.func']) nav = self.apb.build_navigation('main.sub', ['main.sub.func'], 'main.sub.func') html = nav.unicode(indent=0) @@ -277,10 +297,7 @@ ) in html def test_build_root_namespace_view(self): - namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', - 'main.SomeClass', - 'main.SomeSubClass']) - data = self.apb.prepare_namespace_pages(namespace_tree) + data = self.apb.prepare_namespace_pages(self.namespace_tree) self.apb.build_namespace_pages(data, self.project) rootfile = self.base.join('api/index.html') assert rootfile.check() Modified: py/dist/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_functional.py (original) +++ py/dist/py/apigen/testing/test_apigen_functional.py Mon Jan 22 19:23:07 2007 @@ -31,13 +31,20 @@ def get_somevar(self): return self.somevar + 1 """)) + temp.ensure('pkg/somenamespace.py').write(py.code.Source("""\ + def foo(): + return 'bar' + def baz(qux): + return qux + """)) temp.ensure("pkg/__init__.py").write(py.code.Source("""\ from py.initpkg import initpkg initpkg(__name__, exportdefs = { 'main.sub.func': ("./func.py", "func"), 'main.func': ("./func.py", "func_2"), 'main.SomeTestClass': ('./sometestclass.py', 'SomeTestClass'), - 'main.SomeTestSubClass': ('./sometestsubclass.py', 'SomeTestSubClass'), + 'main.SomeTestSubClass': ('./sometestsubclass.py', + 'SomeTestSubClass'), }) """)) temp.ensure('pkg/test/test_pkg.py').write(py.code.Source("""\ From fijal at codespeak.net Mon Jan 22 21:21:12 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 21:21:12 +0100 (CET) Subject: [py-svn] r37159 - in py/branch/config/py: code test/rsession test/terminal Message-ID: <20070122202112.51D3710089@code0.codespeak.net> Author: fijal Date: Mon Jan 22 21:21:10 2007 New Revision: 37159 Added: py/branch/config/py/code/representation.py Modified: py/branch/config/py/test/rsession/reporter.py py/branch/config/py/test/terminal/terminal.py Log: First attempt to share some reporting code between terminal session and rsession. Added: py/branch/config/py/code/representation.py ============================================================================== --- (empty file) +++ py/branch/config/py/code/representation.py Mon Jan 22 21:21:10 2007 @@ -0,0 +1,34 @@ + +""" This file intends to gather all methods of representing +failures/tracebacks etc. which should be used among +all terminal-based reporters. This methods should be general, +to allow further use outside the pylib +""" + +# XXX: Probably it all should go as methods of proper +# objects + +class Presenter(object): + """ Class used for presentation of various objects, + sharing common output style + """ + def __init__(self, out): + """ out is a file-like object (we can write to it) + """ + assert hasattr(out, 'write') + self.out = out + + def repr_source(self, source, marker=">", marker_location=-1): + if marker_location < 0: + marker_location += len(source) + if marker_location < 0: + marker_location = 0 + if marker_location >= len(source): + marker_location = len(source) - 1 + for i in range(len(source)): + if i == marker_location: + prefix = marker + " " + else: + prefix = " " + self.out.line(prefix + source[i]) + Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Mon Jan 22 21:21:10 2007 @@ -11,6 +11,7 @@ from py.__.test.rsession import report from py.__.test.rsession import outcome from py.__.misc.terminal_helper import ansi_print, get_terminal_width +from py.__.code.representation import Presenter import sys @@ -22,6 +23,7 @@ self.failed_tests_outcome = [] self.skipped_tests_outcome = [] self.out = getout(py.std.sys.stdout) + self.presenter = Presenter(self.out) self.failed = dict([(host, 0) for host in hosts]) self.skipped = dict([(host, 0) for host in hosts]) self.passed = dict([(host, 0) for host in hosts]) @@ -154,20 +156,14 @@ for index, entry in py.builtin.enumerate(traceback): self.out.sep('-') self.out.line("%s: %s" % (entry.path, entry.lineno)) - self.repr_source(entry.relline, str(entry.source)) + self.presenter.repr_source(entry.source, marker_location= + entry.relline) elif self.config.option.tbstyle == 'short': for index, entry in py.builtin.enumerate(traceback): self.out.line("%s: %s" % (entry.path, entry.lineno)) self.out.line(entry.source) self.out.line("%s: %s" % (excinfo.typename, excinfo.value)) - def repr_source(self, relline, source): - for num, line in enumerate(source.split("\n")): - if num == relline: - self.out.line(">>>>" + line) - else: - self.out.line(" " + line) - def skips(self): texts = {} for event in self.skipped_tests_outcome: Modified: py/branch/config/py/test/terminal/terminal.py ============================================================================== --- py/branch/config/py/test/terminal/terminal.py (original) +++ py/branch/config/py/test/terminal/terminal.py Mon Jan 22 21:21:10 2007 @@ -4,6 +4,7 @@ Item = py.test.Item from py.__.test.terminal.out import getout import py.__.code.safe_repr +from py.__.code.representation import Presenter def getrelpath(source, dest): base = source.common(dest) @@ -26,6 +27,7 @@ self._file = file self.out = getout(file) self._opencollectors = [] + self.presenter = Presenter(self.out) # --------------------- # PROGRESS information @@ -292,10 +294,10 @@ firstsourceline = entry.getfirstlinesource() marker_location = entry.lineno - firstsourceline if entry == last: - self.repr_source(source, 'E', marker_location) + self.presenter.repr_source(source, 'E', marker_location) self.repr_failure_explanation(excinfo, source) else: - self.repr_source(source, '>', marker_location) + self.presenter.repr_source(source, '>', marker_location) self.out.line("") self.out.line("[%s:%d]" %(entry.frame.code.path, entry.lineno+1)) self.repr_locals(entry) @@ -337,11 +339,11 @@ source = [] if entry == last: if source: - self.repr_source(source, 'E') + self.presenter.repr_source(source, 'E') self.repr_failure_explanation(excinfo, source) else: if source: - self.repr_source(source, ' ') + self.presenter.repr_source(source, ' ') self.repr_locals(entry) # trailing info @@ -378,26 +380,12 @@ self.out.sep("_", "entrypoint: %s %s" %(root.basename, modpath)) def getentrysource(self, entry): - try: - source = entry.getsource() + try: + source = entry.getsource() except py.error.ENOENT: source = py.code.Source("[failure to get at sourcelines from %r]\n" % entry) return source.deindent() - def repr_source(self, source, marker=">", marker_location=-1): - if marker_location < 0: - marker_location += len(source) - if marker_location < 0: - marker_location = 0 - if marker_location >= len(source): - marker_location = len(source) - 1 - for i in range(len(source)): - if i == marker_location: - prefix = marker + " " - else: - prefix = " " - self.out.line(prefix + source[i]) - def repr_failure_explanation(self, excinfo, source): try: s = str(source.getstatement(len(source)-1)) From fijal at codespeak.net Mon Jan 22 21:41:00 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 21:41:00 +0100 (CET) Subject: [py-svn] r37160 - py/branch/config/py/test/rsession Message-ID: <20070122204100.314E910089@code0.codespeak.net> Author: fijal Date: Mon Jan 22 21:40:59 2007 New Revision: 37160 Removed: py/branch/config/py/test/rsession/cleanup-rsession.txt Log: This was implemented, that file might go away. Deleted: /py/branch/config/py/test/rsession/cleanup-rsession.txt ============================================================================== --- /py/branch/config/py/test/rsession/cleanup-rsession.txt Mon Jan 22 21:40:59 2007 +++ (empty file) @@ -1,42 +0,0 @@ -Quick overview to make myself sure what I'm talking about. - -exit cases: - -1. normal exit (tests finished) -2. -x and a failing test seen at sending side -3. C-c pressed, or SystemExit raised - -exit conditions: - -- normal cleanup (exit) -- cleanup of remote nodes (rsession only) - possibly kill child processes - and close gateway nicely -- cleanup of web server (only regarding to web interface) - probably later - -Normal exit: - -easy :), just works - --x and a failing test: - -works, but with a hack - -C-c hard case: - -we should have different layers of C-c pressed, to make sure that we can -interrupt teardown and still exit cleanly, that's why I don't like the idea -of having finally: beacause exceptions are ignored inside finally. - -We should kill Info.pid hack, which is quite awfull usecase of global -variable. - -So: - - first strike of C-c should go to hosts_teardown and start sending nodes info - that they should kill boxes. - - second strike should exit this teardown, print some message like "abandoned" - and eventually try to kill web server. - - third strike should just exit program. - From fijal at codespeak.net Mon Jan 22 21:42:42 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 22 Jan 2007 21:42:42 +0100 (CET) Subject: [py-svn] r37161 - py/branch/config/py/test/rsession Message-ID: <20070122204242.755CB10089@code0.codespeak.net> Author: fijal Date: Mon Jan 22 21:42:41 2007 New Revision: 37161 Modified: py/branch/config/py/test/rsession/reporter.py Log: Typo in docstring. Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Mon Jan 22 21:42:41 2007 @@ -2,7 +2,7 @@ """ reporter - different reporter for different purposes ;-) Still lacks: - 1. Hanging nodes are not good done + 1. Hanging nodes are not done well """ import py From fijal at codespeak.net Tue Jan 23 00:27:51 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 00:27:51 +0100 (CET) Subject: [py-svn] r37163 - in py/branch/config/py: code test/rsession test/terminal Message-ID: <20070122232751.9F99510092@code0.codespeak.net> Author: fijal Date: Tue Jan 23 00:27:49 2007 New Revision: 37163 Modified: py/branch/config/py/code/representation.py py/branch/config/py/test/rsession/reporter.py py/branch/config/py/test/terminal/terminal.py Log: Move another method to a common place. Modified: py/branch/config/py/code/representation.py ============================================================================== --- py/branch/config/py/code/representation.py (original) +++ py/branch/config/py/code/representation.py Tue Jan 23 00:27:49 2007 @@ -19,6 +19,9 @@ self.out = out def repr_source(self, source, marker=">", marker_location=-1): + """ This one represents piece of source with possible + marker at requested position + """ if marker_location < 0: marker_location += len(source) if marker_location < 0: @@ -32,3 +35,18 @@ prefix = " " self.out.line(prefix + source[i]) + def repr_item_info(self, item): + """ This method represents py.test.Item info (path and module) + """ + root = item.fspath + modpath = item.getmodpath() + try: + fn, lineno = item.getpathlineno() + except TypeError: + assert isinstance(item.parent, py.test.collect.Generator) + # a generative test yielded a non-callable + fn, lineno = item.parent.getpathlineno() + if root == fn: + self.out.sep("_", "entrypoint: %s" %(modpath)) + else: + self.out.sep("_", "entrypoint: %s %s" %(root.basename, modpath)) Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Tue Jan 23 00:27:49 2007 @@ -112,6 +112,7 @@ host = self.gethost(event) self.out.sep('_', "%s on %s" % (" ".join(event.item.listnames()), host)) + self.presenter.repr_item_info(event.item) if event.outcome.signal: self.repr_signal(event.item, event.outcome) else: @@ -156,7 +157,8 @@ for index, entry in py.builtin.enumerate(traceback): self.out.sep('-') self.out.line("%s: %s" % (entry.path, entry.lineno)) - self.presenter.repr_source(entry.source, marker_location= + source = entry.source.split("\n") + self.presenter.repr_source(source, marker_location= entry.relline) elif self.config.option.tbstyle == 'short': for index, entry in py.builtin.enumerate(traceback): Modified: py/branch/config/py/test/terminal/terminal.py ============================================================================== --- py/branch/config/py/test/terminal/terminal.py (original) +++ py/branch/config/py/test/terminal/terminal.py Tue Jan 23 00:27:49 2007 @@ -284,9 +284,9 @@ last = traceback[-1] first = traceback[0] for index, entry in py.builtin.enumerate(traceback): - if entry == first: + if entry == first: if item: - self.repr_failure_info(item, entry) + self.presenter.repr_item_info(item) self.out.line() else: self.out.line("") @@ -304,8 +304,6 @@ # trailing info if entry == last: - #if item: - # self.repr_failure_info(item, entry) self.repr_out_err(item) self.out.sep("_") else: @@ -348,8 +346,6 @@ # trailing info if entry == last: - #if item: - # self.repr_failure_info(item, entry) self.repr_out_err(item) self.out.sep("_") else: @@ -361,24 +357,6 @@ # the following is only used by the combination '--pdb --tb=no' repr_failure_tbno = repr_failure_tbshort - def repr_failure_info(self, item, entry): - root = item.fspath - modpath = item.getmodpath() - try: - fn, lineno = item.getpathlineno() - except TypeError: - assert isinstance(item.parent, py.test.collect.Generator) - # a generative test yielded a non-callable - fn, lineno = item.parent.getpathlineno() - # hum, the following overloads traceback output - #if fn != entry.frame.code.path or \ - # entry.frame.code.firstlineno != lineno: - # self.out.line("testcode: %s:%d" % (fn, lineno+1)) - if root == fn: - self.out.sep("_", "entrypoint: %s" %(modpath)) - else: - self.out.sep("_", "entrypoint: %s %s" %(root.basename, modpath)) - def getentrysource(self, entry): try: source = entry.getsource() From cfbolz at codespeak.net Tue Jan 23 10:32:02 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 23 Jan 2007 10:32:02 +0100 (CET) Subject: [py-svn] r37169 - py/dist/py/rest Message-ID: <20070123093202.BECD61008B@code0.codespeak.net> Author: cfbolz Date: Tue Jan 23 10:32:01 2007 New Revision: 37169 Modified: py/dist/py/rest/rst.py Log: typo Modified: py/dist/py/rest/rst.py ============================================================================== --- py/dist/py/rest/rst.py (original) +++ py/dist/py/rest/rst.py Tue Jan 23 10:32:01 2007 @@ -111,7 +111,7 @@ self.links = {} def render_links(self, check=False): - """render the link attachents of the document""" + """render the link attachments of the document""" assert not check, "Link checking not implemented" if not self.links: return "" From fijal at codespeak.net Tue Jan 23 10:49:11 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 10:49:11 +0100 (CET) Subject: [py-svn] r37170 - py/branch/config/py/test Message-ID: <20070123094911.F20C81008B@code0.codespeak.net> Author: fijal Date: Tue Jan 23 10:49:10 2007 New Revision: 37170 Modified: py/branch/config/py/test/defaultconftest.py Log: Those options does not require subprocess Modified: py/branch/config/py/test/defaultconftest.py ============================================================================== --- py/branch/config/py/test/defaultconftest.py (original) +++ py/branch/config/py/test/defaultconftest.py Tue Jan 23 10:49:10 2007 @@ -66,21 +66,6 @@ Option('', '--traceconfig', action="store_true", dest="traceconfig", default=False, help="trace considerations of conftest.py files."), - ) - - py.test.config.addoptions('EXPERIMENTAL options implying subprocesses', - Option('', '--tkinter', - action="store_true", dest="tkinter", default=False, - help="use tkinter test session frontend."), - Option('', '--dist', - action="store_true", dest="dist", default=False, - help="use ad-hoc distributed testing (requires conftest settings)"), - Option('', '--looponfailing', - action="store_true", dest="looponfailing", default=False, - help="loop on failing test set."), - Option('', '--exec', - action="store", dest="executable", default=None, - help="python executable to run the tests with."), Option('-w', '--startserver', action="store_true", dest="startserver", default=False, help="start HTTP server listening on localhost:8000 for test." @@ -100,4 +85,19 @@ action="store", dest="session", default=None, help="lookup sessioname in conftest.py files and use it."), ) + + py.test.config.addoptions('EXPERIMENTAL options implying subprocesses', + Option('', '--tkinter', + action="store_true", dest="tkinter", default=False, + help="use tkinter test session frontend."), + Option('', '--dist', + action="store_true", dest="dist", default=False, + help="use ad-hoc distributed testing (requires conftest settings)"), + Option('', '--looponfailing', + action="store_true", dest="looponfailing", default=False, + help="loop on failing test set."), + Option('', '--exec', + action="store", dest="executable", default=None, + help="python executable to run the tests with."), + ) From fijal at codespeak.net Tue Jan 23 11:25:39 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 11:25:39 +0100 (CET) Subject: [py-svn] r37171 - py/branch/config/py/test Message-ID: <20070123102539.3F50E10089@code0.codespeak.net> Author: fijal Date: Tue Jan 23 11:25:37 2007 New Revision: 37171 Modified: py/branch/config/py/test/defaultconftest.py Log: Add an option for boxing, XXX should be also --no-box to override conftest decision. Modified: py/branch/config/py/test/defaultconftest.py ============================================================================== --- py/branch/config/py/test/defaultconftest.py (original) +++ py/branch/config/py/test/defaultconftest.py Tue Jan 23 11:25:37 2007 @@ -93,6 +93,9 @@ Option('', '--dist', action="store_true", dest="dist", default=False, help="use ad-hoc distributed testing (requires conftest settings)"), + Option('', '--box', + action="store_true", dest="boxing", + help="use boxing (running each test in external process)"), Option('', '--looponfailing', action="store_true", dest="looponfailing", default=False, help="loop on failing test set."), From fijal at codespeak.net Tue Jan 23 11:26:11 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 11:26:11 +0100 (CET) Subject: [py-svn] r37172 - in py/branch/config/py/test: . testing Message-ID: <20070123102611.8FB7A1008A@code0.codespeak.net> Author: fijal Date: Tue Jan 23 11:26:10 2007 New Revision: 37172 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/testing/test_config.py Log: Boxing implies lsession Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Tue Jan 23 11:26:10 2007 @@ -135,18 +135,23 @@ elif self.option.tkinter: name = 'TkinterSession' else: - optnames = 'startserver runbrowser apigen restreport'.split() + optnames = 'startserver runbrowser apigen restreport boxing'.split() for opt in optnames: if getattr(self.option, opt, False): name = 'LSession' break else: + if self.getvalue('dist_boxing'): + name = 'LSession' if self.option.looponfailing: name = 'RemoteTerminalSession' elif self.option.executable: name = 'RemoteTerminalSession' return name + def is_boxed(self): + return self.getvalue("dist_boxing") or self.config.option.boxing + def _reparse(self, args): """ this is used from tests that want to re-invoke parse(). """ global config_per_process Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Tue Jan 23 11:26:10 2007 @@ -181,8 +181,8 @@ assert config._getsessionname() == 'RSession' def test_implied_lsession(self): - optnames = 'startserver runbrowser apigen=x rest'.split() - for x in optnames: + optnames = 'startserver runbrowser apigen=x rest box'.split() + for x in optnames: config = py.test.config._reparse([self.tmpdir, '--%s' % x]) assert config._getsessionname() == 'LSession' From fijal at codespeak.net Tue Jan 23 11:26:33 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 11:26:33 +0100 (CET) Subject: [py-svn] r37173 - py/branch/config/py/test/rsession Message-ID: <20070123102633.998B51008E@code0.codespeak.net> Author: fijal Date: Tue Jan 23 11:26:32 2007 New Revision: 37173 Modified: py/branch/config/py/test/rsession/rsession.py Log: Adhere to --box option. Modified: py/branch/config/py/test/rsession/rsession.py ============================================================================== --- py/branch/config/py/test/rsession/rsession.py (original) +++ py/branch/config/py/test/rsession/rsession.py Tue Jan 23 11:26:32 2007 @@ -279,7 +279,8 @@ self.tracer = Tracer(self.docstorage) return apigen_runner else: - if self.config.getvalue('dist_boxing'): + if (self.config.getvalue('dist_boxing') or self.config.option.boxing)\ + and not self.config.option.nocapture: return box_runner return plain_runner From fijal at codespeak.net Tue Jan 23 11:26:54 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 11:26:54 +0100 (CET) Subject: [py-svn] r37174 - py/branch/config/py/test/testing Message-ID: <20070123102654.3A9F510089@code0.codespeak.net> Author: fijal Date: Tue Jan 23 11:26:53 2007 New Revision: 37174 Modified: py/branch/config/py/test/testing/test_collect.py Log: Skip those tests if boxing is enabled Modified: py/branch/config/py/test/testing/test_collect.py ============================================================================== --- py/branch/config/py/test/testing/test_collect.py (original) +++ py/branch/config/py/test/testing/test_collect.py Tue Jan 23 11:26:53 2007 @@ -266,6 +266,8 @@ assert len(l) == 1 def test_order_of_execution_generator_same_codeline(): + if py.test.config.is_boxed(): + py.test.skip("Does not work with boxing") test_list = [] expected_list = range(6) @@ -283,6 +285,8 @@ def test_order_of_execution_generator_different_codeline(): + if py.test.config.is_boxed(): + py.test.skip("Does not work with boxing") test_list = [] expected_list = range(3) From fijal at codespeak.net Tue Jan 23 11:27:45 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 11:27:45 +0100 (CET) Subject: [py-svn] r37175 - py/branch/config/py/test/rsession/testing Message-ID: <20070123102745.4E6221008A@code0.codespeak.net> Author: fijal Date: Tue Jan 23 11:27:44 2007 New Revision: 37175 Modified: py/branch/config/py/test/rsession/testing/test_lsession.py Log: - Make test safer, so pdb is not overwritten (boxing jumps over it, but --pdb forces boxing to disappear) - Write down a test for runner chooser. Modified: py/branch/config/py/test/rsession/testing/test_lsession.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_lsession.py (original) +++ py/branch/config/py/test/rsession/testing/test_lsession.py Tue Jan 23 11:27:44 2007 @@ -5,7 +5,7 @@ import py from py.__.test.rsession.rsession import LSession from py.__.test.rsession import report -from py.__.test.rsession.local import box_runner, plain_runner +from py.__.test.rsession.local import box_runner, plain_runner, apigen_runner def setup_module(mod): mod.tmp = py.test.ensuretemp("lsession_module") @@ -82,22 +82,26 @@ l = [] def some_fun(*args): l.append(args) - - pdb.post_mortem = some_fun - args = [str(tmpdir.join(subdir)), '--pdb'] - config = py.test.config._reparse(args) - lsession = LSession(config) - allevents = [] + try: - lsession.main(reporter=allevents.append, runner=plain_runner) - except SystemExit: - pass - else: - py.test.fail("Didn't raise system exit") - failure_events = [event for event in allevents if isinstance(event, - report.ImmediateFailure)] - assert len(failure_events) == 1 - assert len(l) == 1 + post_mortem = pdb.post_mortem + pdb.post_mortem = some_fun + args = [str(tmpdir.join(subdir)), '--pdb'] + config = py.test.config._reparse(args) + lsession = LSession(config) + allevents = [] + try: + lsession.main(reporter=allevents.append, runner=plain_runner) + except SystemExit: + pass + else: + py.test.fail("Didn't raise system exit") + failure_events = [event for event in allevents if isinstance(event, + report.ImmediateFailure)] + assert len(failure_events) == 1 + assert len(l) == 1 + finally: + pdb.post_mortem = post_mortem def test_minus_x(self): if not hasattr(py.std.os, 'fork'): @@ -262,3 +266,31 @@ assert testevents[0].outcome.passed assert testevents[0].outcome.stderr == "" assert testevents[0].outcome.stdout == "1\n2\n3\n" + + def test_runner_selection(self): + tmpdir = py.test.ensuretemp("lsession_runner_selection") + tmpdir.ensure("apigen.py").write(py.code.Source(""" + def get_documentable_items(*args): + return {} + """)) + opt_mapping = { + '': plain_runner, + '--box': box_runner, + '--apigen=%s/apigen.py' % str(tmpdir): apigen_runner, + } + pkgdir = tmpdir.dirpath() + for opt in opt_mapping.keys(): + if opt: + all = opt + " " + str(tmpdir) + else: + all = str(tmpdir) + config = py.test.config._reparse(all.split(" ")) + lsession = LSession(config) + assert lsession.init_runner(pkgdir) is opt_mapping[opt] + #tmpdir.dirpath().ensure("conftest.py").write(py.code.Source(""" + #dist_boxing=True + #""")) + #config = py.test.config._reparse([str(tmpdir)]) + #lsession = LSession(config) + #assert lsession.init_runner(pkgdir) is box_runner + # XXX check why it fails From fijal at codespeak.net Tue Jan 23 11:29:23 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 11:29:23 +0100 (CET) Subject: [py-svn] r37176 - in py/branch/config/py: code test/rsession test/terminal Message-ID: <20070123102923.A435E10089@code0.codespeak.net> Author: fijal Date: Tue Jan 23 11:29:21 2007 New Revision: 37176 Modified: py/branch/config/py/code/representation.py py/branch/config/py/test/rsession/reporter.py py/branch/config/py/test/terminal/terminal.py Log: Move one method from terminal outside to the representation.py. Now rsession should use this one as well. Modified: py/branch/config/py/code/representation.py ============================================================================== --- py/branch/config/py/code/representation.py (original) +++ py/branch/config/py/code/representation.py Tue Jan 23 11:29:21 2007 @@ -12,16 +12,20 @@ """ Class used for presentation of various objects, sharing common output style """ - def __init__(self, out): + def __init__(self, out, config): """ out is a file-like object (we can write to it) """ assert hasattr(out, 'write') self.out = out + self.config = config def repr_source(self, source, marker=">", marker_location=-1): """ This one represents piece of source with possible marker at requested position """ + if isinstance(source, str): + # why the hell, string is iterable? + source = source.split("\n") if marker_location < 0: marker_location += len(source) if marker_location < 0: @@ -50,3 +54,44 @@ self.out.sep("_", "entrypoint: %s" %(modpath)) else: self.out.sep("_", "entrypoint: %s %s" %(root.basename, modpath)) + + def repr_failure_explanation(self, excinfo, source): + try: + s = str(source.getstatement(len(source)-1)) + except KeyboardInterrupt: + raise + except: + s = str(source[-1]) + indent = " " * (4 + (len(s) - len(s.lstrip()))) + # get the real exception information out + lines = excinfo.exconly(tryshort=True).split('\n') + self.out.line('>' + indent[:-1] + lines.pop(0)) + for x in lines: + self.out.line(indent + x) + return + + # XXX reinstate the following with a --magic option? + # the following line gets user-supplied messages (e.g. + # for "assert 0, 'custom message'") + msg = getattr(getattr(excinfo, 'value', ''), 'msg', '') + info = None + if not msg: + special = excinfo.errisinstance((SyntaxError, SystemExit, KeyboardInterrupt)) + if not self.config.option.nomagic and not special: + try: + info = excinfo.traceback[-1].reinterpret() # very detailed info + except KeyboardInterrupt: + raise + except: + if self.config.option.verbose >= 1: + self.out.line("[reinterpretation traceback]") + py.std.traceback.print_exc(file=py.std.sys.stdout) + else: + self.out.line("[reinterpretation failed, increase " + "verbosity to see details]") + # print reinterpreted info if any + if info: + lines = info.split('\n') + self.out.line('>' + indent[:-1] + lines.pop(0)) + for x in lines: + self.out.line(indent + x) Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Tue Jan 23 11:29:21 2007 @@ -23,7 +23,7 @@ self.failed_tests_outcome = [] self.skipped_tests_outcome = [] self.out = getout(py.std.sys.stdout) - self.presenter = Presenter(self.out) + self.presenter = Presenter(self.out, config) self.failed = dict([(host, 0) for host in hosts]) self.skipped = dict([(host, 0) for host in hosts]) self.passed = dict([(host, 0) for host in hosts]) @@ -125,7 +125,7 @@ def gethost(self, event): return event.host.hostname - def repr_failure(self, item, outcome): + def repr_failure(self, item, outcome): excinfo = outcome.excinfo traceback = excinfo.traceback #if item and not self.config.option.fulltrace: Modified: py/branch/config/py/test/terminal/terminal.py ============================================================================== --- py/branch/config/py/test/terminal/terminal.py (original) +++ py/branch/config/py/test/terminal/terminal.py Tue Jan 23 11:29:21 2007 @@ -27,7 +27,7 @@ self._file = file self.out = getout(file) self._opencollectors = [] - self.presenter = Presenter(self.out) + self.presenter = Presenter(self.out, config) # --------------------- # PROGRESS information @@ -295,7 +295,7 @@ marker_location = entry.lineno - firstsourceline if entry == last: self.presenter.repr_source(source, 'E', marker_location) - self.repr_failure_explanation(excinfo, source) + self.presenter.repr_failure_explanation(excinfo, source) else: self.presenter.repr_source(source, '>', marker_location) self.out.line("") @@ -338,7 +338,7 @@ if entry == last: if source: self.presenter.repr_source(source, 'E') - self.repr_failure_explanation(excinfo, source) + self.presenter.repr_failure_explanation(excinfo, source) else: if source: self.presenter.repr_source(source, ' ') @@ -364,47 +364,6 @@ source = py.code.Source("[failure to get at sourcelines from %r]\n" % entry) return source.deindent() - def repr_failure_explanation(self, excinfo, source): - try: - s = str(source.getstatement(len(source)-1)) - except KeyboardInterrupt: - raise - except: - s = str(source[-1]) - indent = " " * (4 + (len(s) - len(s.lstrip()))) - # get the real exception information out - lines = excinfo.exconly(tryshort=True).split('\n') - self.out.line('>' + indent[:-1] + lines.pop(0)) - for x in lines: - self.out.line(indent + x) - return - - # XXX reinstate the following with a --magic option? - # the following line gets user-supplied messages (e.g. - # for "assert 0, 'custom message'") - msg = getattr(getattr(excinfo, 'value', ''), 'msg', '') - info = None - if not msg: - special = excinfo.errisinstance((SyntaxError, SystemExit, KeyboardInterrupt)) - if not self.config.option.nomagic and not special: - try: - info = excinfo.traceback[-1].reinterpret() # very detailed info - except KeyboardInterrupt: - raise - except: - if self.config.option.verbose >= 1: - self.out.line("[reinterpretation traceback]") - py.std.traceback.print_exc(file=py.std.sys.stdout) - else: - self.out.line("[reinterpretation failed, increase " - "verbosity to see details]") - # print reinterpreted info if any - if info: - lines = info.split('\n') - self.out.line('>' + indent[:-1] + lines.pop(0)) - for x in lines: - self.out.line(indent + x) - def repr_out_err(self, colitem): for parent in colitem.listchain(): for name, obj in zip(['out', 'err'], parent.getouterr()): From fijal at codespeak.net Tue Jan 23 11:38:50 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 11:38:50 +0100 (CET) Subject: [py-svn] r37178 - py/branch/config/py/test/rsession Message-ID: <20070123103850.8DD3910089@code0.codespeak.net> Author: fijal Date: Tue Jan 23 11:38:39 2007 New Revision: 37178 Modified: py/branch/config/py/test/rsession/rest.py Log: Make it a bit more working. Modified: py/branch/config/py/test/rsession/rest.py ============================================================================== --- py/branch/config/py/test/rsession/rest.py (original) +++ py/branch/config/py/test/rsession/rest.py Tue Jan 23 11:38:39 2007 @@ -26,18 +26,23 @@ if self.config.option.verbose: self.add_rest(Paragraph("Unknown report: %s" % what)) + def gethost(self, item): + if item.channel: + return item.channel.gateway.host + return self.hosts[0] + def report_SendItem(self, item): - address = item.channel.gateway.host.hostname + address = self.gethost(item) if self.config.option.verbose: self.add_rest(Paragraph('sending item %s to %s' % (item.item, address))) def report_HostRSyncing(self, item): - self.add_rest(LiteralBlock('%10s: RSYNC ==> %s' % (item.hostname[:10], + self.add_rest(LiteralBlock('%10s: RSYNC ==> %s' % (item.host.hostname[:10], item.remoterootpath))) def report_HostReady(self, item): - self.add_rest(LiteralBlock('%10s: READY' % (item.hostname[:10],))) + self.add_rest(LiteralBlock('%10s: READY' % (item.host.hostname[:10],))) def report_TestStarted(self, event): txt = "Running tests on hosts: %s" % ", ".join(event.hosts) @@ -86,7 +91,7 @@ self.out.write(self.rest.render_links()) def report_ReceivedItemOutcome(self, event): - host = event.channel.gateway.host + host = self.gethost(event) if event.outcome.passed: status = [Strong("PASSED")] self.passed[host] += 1 From guido at codespeak.net Tue Jan 23 11:42:46 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 23 Jan 2007 11:42:46 +0100 (CET) Subject: [py-svn] r37180 - py/dist/py/test/rsession Message-ID: <20070123104246.CFB3410089@code0.codespeak.net> Author: guido Date: Tue Jan 23 11:42:45 2007 New Revision: 37180 Modified: py/dist/py/test/rsession/rest.py Log: Using RelLinkWriter when no 'linkwriter' config option is set. Modified: py/dist/py/test/rsession/rest.py ============================================================================== --- py/dist/py/test/rsession/rest.py (original) +++ py/dist/py/test/rsession/rest.py Tue Jan 23 11:42:45 2007 @@ -19,7 +19,12 @@ def get_linkwriter(self): if self.linkwriter is None: - self.linkwriter = self.config.getvalue('linkwriter') + try: + self.linkwriter = self.config.getvalue('linkwriter') + except KeyError: + print >>sys.stderr, ('no linkwriter configured, using default ' + 'one') + self.linkwriter = RelLinkWriter() return self.linkwriter def report_unknown(self, what): From guido at codespeak.net Tue Jan 23 13:14:05 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 23 Jan 2007 13:14:05 +0100 (CET) Subject: [py-svn] r37184 - py/dist/py/apigen Message-ID: <20070123121405.F17E410089@code0.codespeak.net> Author: guido Date: Tue Jan 23 13:14:03 2007 New Revision: 37184 Modified: py/dist/py/apigen/apigen.py Log: Outputting to a more sane default directory: the parent of the pkgdir. Modified: py/dist/py/apigen/apigen.py ============================================================================== --- py/dist/py/apigen/apigen.py (original) +++ py/dist/py/apigen/apigen.py Tue Jan 23 13:14:03 2007 @@ -31,7 +31,7 @@ if 'APIGEN_TARGET' in os.environ: targetdir = py.path.local(os.environ['APIGEN_TARGET']) else: - targetdir = py.path.local('/tmp/py_apigen_output') + targetdir = pkgdir.dirpath().join('apigen') targetdir.ensure(dir=True) all_names = dsa._get_names(filter=lambda x, y: True) From hpk at codespeak.net Tue Jan 23 14:53:19 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 23 Jan 2007 14:53:19 +0100 (CET) Subject: [py-svn] r37193 - in py/branch/config/py/test: . rsession terminal testing Message-ID: <20070123135319.42B2810075@code0.codespeak.net> Author: hpk Date: Tue Jan 23 14:53:17 2007 New Revision: 37193 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/rsession/reporter.py py/branch/config/py/test/terminal/remote.py py/branch/config/py/test/testing/test_config.py py/branch/config/py/test/testing/test_conftesthandle.py py/branch/config/py/test/testing/test_session.py Log: introduced config.topdir, tests and use it from terminal/remote at least. also fix fijal's "--box" option handling a bit, but i am not sure it should stay this way at all. Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Tue Jan 23 14:53:17 2007 @@ -50,8 +50,7 @@ fixoptions(self.option) # XXX fixing should be moved to sessions if not args: args.append(py.std.os.getcwd()) - args = [py.path.local(x) for x in args] - self.topdir = reduce(py.path.local.common, args) + self.topdir = gettopdir(args) self.args = args def initdirect(self, topdir, repr, coltrails=None): @@ -150,7 +149,8 @@ return name def is_boxed(self): - return self.getvalue("dist_boxing") or self.config.option.boxing + # XXX probably not a good idea to have this special function ... + return self.option.boxing or self.getvalue("dist_boxing") def _reparse(self, args): """ this is used from tests that want to re-invoke parse(). """ @@ -248,3 +248,16 @@ raise ValueError, "--exec together with --pdb not supported yet." +def gettopdir(args): + """ return the top directory for the given paths. + if the common base dir resides in a python package + parent directory of the root package is returned. + """ + args = [py.path.local(arg) for arg in args] + p = reduce(py.path.local.common, args) + assert p, "cannot determine common basedir of %s" %(args,) + pkgdir = p.pypkgpath() + if pkgdir is None: + return p + else: + return pkgdir.dirpath() Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Tue Jan 23 14:53:17 2007 @@ -51,6 +51,7 @@ def report_SendItem(self, item): address = item.host.hostname + assert isinstance(item.host.hostname, str) if self.config.option.verbose: print "Sending %s to %s" % (item.item, address) Modified: py/branch/config/py/test/terminal/remote.py ============================================================================== --- py/branch/config/py/test/terminal/remote.py (original) +++ py/branch/config/py/test/terminal/remote.py Tue Jan 23 14:53:17 2007 @@ -51,24 +51,6 @@ l.append(current) return l -def generalize(p1, p2): - general = p1 - for x, y in zip(p1.parts(), p2.parts()): - if x != y: - break - general = x - return general - -def getrootdir(args): - tops = [] - for arg in args: - p = py.path.local(arg) - tops.append(p.pypkgpath() or p) - p = reduce(generalize, tops) - if p.check(file=1): - p = p.dirpath() - return p - class RemoteTerminalSession(object): def __init__(self, config, file=None): self.config = config @@ -88,7 +70,7 @@ self.executable = executable def main(self): - rootdir = getrootdir(self.config.args) + rootdir = self.config.topdir wasfailing = False failures = [] while 1: Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Tue Jan 23 14:53:17 2007 @@ -1,6 +1,8 @@ from __future__ import generators import py +from py.__.test.config import gettopdir + def test_tmpdir(): d1 = py.test.ensuretemp('hello') d2 = py.test.ensuretemp('hello') @@ -83,13 +85,20 @@ config = py.test.config._reparse([str(o)]) assert config.getvalue('x') == 1 -def test_topdir(): +def test_gettopdir(): tmp = py.test.ensuretemp("topdir") - config = py.test.config._reparse([tmp]) - assert config.topdir == tmp - config = py.test.config._reparse([tmp.join('hello'), - tmp.join("world")]) - assert config.topdir == tmp + assert gettopdir([tmp]) == tmp + topdir =gettopdir([tmp.join("hello"), tmp.join("world")]) + assert topdir == tmp + +def test_gettopdir_pypkg(): + tmp = py.test.ensuretemp("topdir2") + a = tmp.ensure('a', dir=1) + b = tmp.ensure('a', 'b', '__init__.py') + c = tmp.ensure('a', 'b', 'c.py') + Z = tmp.ensure('Z', dir=1) + assert gettopdir([c]) == a + assert gettopdir([c, Z]) == tmp def test_config_init_direct(): py.test.skip("XXX partially not implemented") @@ -218,6 +227,24 @@ session = config.initsession() assert session.config is config + def test_boxing_options(self): + # XXX config.is_boxed() is probably not a good idea + tmpdir = self.tmpdir + config = py.test.config._reparse([tmpdir]) + assert not config.option.boxing + assert not config.is_boxed() + + #tmpdir.join("conftest.py").write("dist_boxing=True\n") + #config = py.test.config._reparse([tmpdir]) + #assert config.is_boxed() + + tmpdir.join("conftest.py").write("dist_boxing=False\n") + config = py.test.config._reparse([tmpdir]) + assert not config.is_boxed() + config = py.test.config._reparse([tmpdir, '--box']) + assert config.is_boxed() + + class TestConfigColitems: def setup_class(cls): cls.tmproot = py.test.ensuretemp(cls.__name__) Modified: py/branch/config/py/test/testing/test_conftesthandle.py ============================================================================== --- py/branch/config/py/test/testing/test_conftesthandle.py (original) +++ py/branch/config/py/test/testing/test_conftesthandle.py Tue Jan 23 14:53:17 2007 @@ -11,6 +11,11 @@ d.ensure("adir/conftest.py").write("a=1 ; Directory = 3") d.ensure("adir/b/conftest.py").write("b=2 ; a = 1.5") + def test_basic_init(self): + conftest = Conftest() + conftest.setinitial([self.basedir.join("adir")]) + assert conftest.rget("a") == 1 + def test_immediate_initialiation_and_incremental_are_the_same(self): conftest = Conftest() snap0 = len(conftest._path2confmods) Modified: py/branch/config/py/test/testing/test_session.py ============================================================================== --- py/branch/config/py/test/testing/test_session.py (original) +++ py/branch/config/py/test/testing/test_session.py Tue Jan 23 14:53:17 2007 @@ -293,9 +293,8 @@ assert expected_output in out -from py.__.test.terminal.remote import getrootdir class TestRemote: - def test_rootdir_is_package(self): + def XXXtest_rootdir_is_package(self): d = tmpdir.ensure('rootdirtest1', dir=1) d.ensure('__init__.py') x1 = d.ensure('subdir', '__init__.py') @@ -307,7 +306,7 @@ assert getrootdir([x3,x2]) == d assert getrootdir([x2,x3]) == d - def test_rootdir_is_not_package(self): + def XXXtest_rootdir_is_not_package(self): one = tmpdir.ensure('rootdirtest1', 'hello') rootdir = getrootdir([one]) assert rootdir == one.dirpath() From fijal at codespeak.net Tue Jan 23 15:51:21 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 15:51:21 +0100 (CET) Subject: [py-svn] r37195 - py/branch/config/py/test/rsession/testing Message-ID: <20070123145121.59F0610069@code0.codespeak.net> Author: fijal Date: Tue Jan 23 15:51:19 2007 New Revision: 37195 Modified: py/branch/config/py/test/rsession/testing/test_rest.py Log: Skip those tests, as I need deeper look at them. Modified: py/branch/config/py/test/rsession/testing/test_rest.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_rest.py (original) +++ py/branch/config/py/test/rsession/testing/test_rest.py Tue Jan 23 15:51:19 2007 @@ -10,6 +10,8 @@ from py.__.rest.rst import * from py.__.test.rsession.hostmanage import HostInfo +py.test.skip("This tests are not really testing, needs rewrite") + class RestTestReporter(RestReporter): def __init__(self, *args, **kwargs): if args: From guido at codespeak.net Tue Jan 23 15:55:53 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 23 Jan 2007 15:55:53 +0100 (CET) Subject: [py-svn] r37196 - py/dist/py/doc Message-ID: <20070123145553.F41C310069@code0.codespeak.net> Author: guido Date: Tue Jan 23 15:55:52 2007 New Revision: 37196 Modified: py/dist/py/doc/conftest.py py/dist/py/doc/test_conftest.py Log: Added textrole for links to apigen documentation. Modified: py/dist/py/doc/conftest.py ============================================================================== --- py/dist/py/doc/conftest.py (original) +++ py/dist/py/doc/conftest.py Tue Jan 23 15:55:52 2007 @@ -1,6 +1,7 @@ from __future__ import generators import py from py.__.misc import rest +from py.__.rest import directive Option = py.test.config.Option option = py.test.config.addoptions("documentation check options", @@ -213,3 +214,27 @@ if p.check(file=1): return self.ReSTChecker(p, parent=self) Directory = DocDirectory + +def resolve_linkrole(name, text): + if name == 'api': + if text == 'py': + return 'py', '../../apigen/api/index.html' + assert text.startswith('py.'), ( + 'api link "%s" does not point to the py package') % (text,) + dotted_name = text + if dotted_name.find('(') > -1: + dotted_name = dotted_name[:text.find('(')] + dotted_name = '.'.join(dotted_name.split('.')[1:]) # remove pkg root + return text, '../../apigen/api/%s.html' % (dotted_name,) + elif name == 'source': + assert text.startswith('py/'), ('source link "%s" does not point ' + 'to the py package') % (text,) + relpath = '/'.join(text.split('/')[1:]) + if relpath.endswith('/') or not relpath: + relpath += 'index.html' + else: + relpath += '.html' + return text, '../../apigen/source/%s' % (relpath,) +directive.register_linkrole('api', resolve_linkrole) +directive.register_linkrole('source', resolve_linkrole) + Modified: py/dist/py/doc/test_conftest.py ============================================================================== --- py/dist/py/doc/test_conftest.py (original) +++ py/dist/py/doc/test_conftest.py Tue Jan 23 15:55:52 2007 @@ -55,3 +55,20 @@ l2 = session.getitemoutcomepairs(py.test.Item.Skipped) assert len(l+l2) == 3 +def test_resolve_linkrole(): + from py.__.doc.conftest import resolve_linkrole + assert resolve_linkrole('api', 'py.foo.bar') == ( + 'py.foo.bar', '../../apigen/api/foo.bar.html') + assert resolve_linkrole('api', 'py.foo.bar()') == ( + 'py.foo.bar()', '../../apigen/api/foo.bar.html') + assert resolve_linkrole('api', 'py') == ( + 'py', '../../apigen/api/index.html') + py.test.raises(AssertionError, 'resolve_linkrole("api", "foo.bar")') + assert resolve_linkrole('source', 'py/foo/bar.py') == ( + 'py/foo/bar.py', '../../apigen/source/foo/bar.py.html') + assert resolve_linkrole('source', 'py/foo/') == ( + 'py/foo/', '../../apigen/source/foo/index.html') + assert resolve_linkrole('source', 'py/') == ( + 'py/', '../../apigen/source/index.html') + py.test.raises(AssertionError, 'resolve_linkrole("source", "/foo/bar/")') + From fijal at codespeak.net Tue Jan 23 15:59:51 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 15:59:51 +0100 (CET) Subject: [py-svn] r37197 - py/branch/config/py/code Message-ID: <20070123145951.0E39010069@code0.codespeak.net> Author: fijal Date: Tue Jan 23 15:59:49 2007 New Revision: 37197 Modified: py/branch/config/py/code/representation.py Log: kill some dead code, which seems to be dead for at least a year by now. Modified: py/branch/config/py/code/representation.py ============================================================================== --- py/branch/config/py/code/representation.py (original) +++ py/branch/config/py/code/representation.py Tue Jan 23 15:59:49 2007 @@ -69,29 +69,3 @@ for x in lines: self.out.line(indent + x) return - - # XXX reinstate the following with a --magic option? - # the following line gets user-supplied messages (e.g. - # for "assert 0, 'custom message'") - msg = getattr(getattr(excinfo, 'value', ''), 'msg', '') - info = None - if not msg: - special = excinfo.errisinstance((SyntaxError, SystemExit, KeyboardInterrupt)) - if not self.config.option.nomagic and not special: - try: - info = excinfo.traceback[-1].reinterpret() # very detailed info - except KeyboardInterrupt: - raise - except: - if self.config.option.verbose >= 1: - self.out.line("[reinterpretation traceback]") - py.std.traceback.print_exc(file=py.std.sys.stdout) - else: - self.out.line("[reinterpretation failed, increase " - "verbosity to see details]") - # print reinterpreted info if any - if info: - lines = info.split('\n') - self.out.line('>' + indent[:-1] + lines.pop(0)) - for x in lines: - self.out.line(indent + x) From guido at codespeak.net Tue Jan 23 16:14:44 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 23 Jan 2007 16:14:44 +0100 (CET) Subject: [py-svn] r37200 - py/dist/py/doc Message-ID: <20070123151444.C29BD10077@code0.codespeak.net> Author: guido Date: Tue Jan 23 16:14:40 2007 New Revision: 37200 Modified: py/dist/py/doc/misc.txt Log: Added some API links for demonstration purposes. Modified: py/dist/py/doc/misc.txt ============================================================================== --- py/dist/py/doc/misc.txt (original) +++ py/dist/py/doc/misc.txt Tue Jan 23 16:14:40 2007 @@ -17,8 +17,8 @@ also ensures that there remains a focus on getting short paths to objects. -The ``py.std`` hook -------------------- +The :api:`py.std` hook +---------------------- Of course, no matter what, everybody will continue to use the python standard library because it is a very usable code base. @@ -27,7 +27,7 @@ statements. For example, to get to the print-exception functionality of the standard library you can write:: - py.std.traceback.print_exc() + py.std.traceback.print_exc() without having to do anything else than the usual ``import py`` at the beginning. Note that not having imports for the @@ -45,7 +45,7 @@ Automagically accessing sub packages doesn't work (yet?) -------------------------------------------------------- -If you use the ``py.std`` hook you currently cannot magically +If you use the :api:`py.std` hook you currently cannot magically import nested packages which otherwise need explicit imports of their sub-packages. For example, the suversion bindings require you to do something like:: @@ -55,7 +55,7 @@ If you just do the naive thing with the py lib, i.e. write ``py.std.svn.client`` it will not work unless you previously imported it already. The py lib currently doesn't try to -magically make this work. The ``py.std`` hook really is +magically make this work. The :api:`py.std` hook really is intended for Python standard modules which very seldomly (if at all) provide such nested packages. @@ -86,9 +86,9 @@ ====================================================== Currently, the py lib offers two ways to interact with -system executables. ``py.process.cmdexec()`` invokes +system executables. :api:`py.process.cmdexec()` invokes the shell in order to execute a string. The other -one, ``localpath.sysexec()`` lets you directly execute a binary. +one, :api:`py.path.local.sysexec()` lets you directly execute a binary. Both approaches will raise an exception in case of a return- code other than 0 and otherwise return the stdout-output @@ -150,7 +150,7 @@ Currently, the ``PATH`` environment variable based search on unix platforms is supported:: - py.path.local.sysfind('svn') + py.path.local.sysfind('svn') which returns the first path whose ``basename`` matches ``svn``. In principle, `sysfind` deploys platform specific algorithms @@ -177,12 +177,12 @@ The py-lib contains some helpers that make writing scripts that work on various Python versions easier. -``py.compat`` -------------- +:api:`py.compat` +---------------- -``py.compat`` provides fixed versions (currently from Python 2.4.4) of various -newer modules to be able to use them in various Python versions. Currently these -are: +:api:`py.compat` provides fixed versions (currently from Python 2.4.4) of +various newer modules to be able to use them in various Python versions. +Currently these are: * doctest * optparse @@ -192,10 +192,10 @@ They are used by replacing the normal ``import ...`` byr ``from py.compat import ...``. -``py.builtin`` --------------- +:api:`py.builtin` +----------------- -``py.builtin`` provides various builtins that were added in later Python +:api:`py.builtin` provides various builtins that were added in later Python versions. If the used Python version used does not provide these builtins, they are pure-Python reimplementations. These currently are: @@ -206,4 +206,4 @@ * set and frozenset (using either the builtin, if available, or the sets module) -``py.builtin.BaseException`` is just ``Exception`` before Python 2.5. +:api:`py.builtin.BaseException` is just ``Exception`` before Python 2.5. From cfbolz at codespeak.net Tue Jan 23 16:29:55 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 23 Jan 2007 16:29:55 +0100 (CET) Subject: [py-svn] r37203 - py/dist/py/doc Message-ID: <20070123152955.BBCB91006F@code0.codespeak.net> Author: cfbolz Date: Tue Jan 23 16:29:54 2007 New Revision: 37203 Modified: py/dist/py/doc/confrest.py Log: factor the content-getting out into a method (so I can override it in a slightly hackish way somewhere else). Modified: py/dist/py/doc/confrest.py ============================================================================== --- py/dist/py/doc/confrest.py (original) +++ py/dist/py/doc/confrest.py Tue Jan 23 16:29:54 2007 @@ -90,9 +90,13 @@ href="http://codespeak.net")) Page = PyPage + + def get_content(self, txtpath, encoding): + return unicode(txtpath.read(), encoding) + def process(self, txtpath): encoding = self.encoding - content = unicode(txtpath.read(), encoding) + content = self.get_content(txtpath, encoding) stylesheet = self.stylesheet if not stylesheet.startswith('http') and \ not txtpath.dirpath(stylesheet).check(): From fijal at codespeak.net Tue Jan 23 16:31:15 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 16:31:15 +0100 (CET) Subject: [py-svn] r37204 - in py/branch/config/py: code test/rsession Message-ID: <20070123153115.895A51006F@code0.codespeak.net> Author: fijal Date: Tue Jan 23 16:31:13 2007 New Revision: 37204 Modified: py/branch/config/py/code/representation.py py/branch/config/py/test/rsession/outcome.py py/branch/config/py/test/rsession/reporter.py Log: Add another part of code, which is shared between rsession/terminal. (actually one line in lsession, but now at least looks a bit better ;-) Modified: py/branch/config/py/code/representation.py ============================================================================== --- py/branch/config/py/code/representation.py (original) +++ py/branch/config/py/code/representation.py Tue Jan 23 16:31:13 2007 @@ -50,13 +50,13 @@ assert isinstance(item.parent, py.test.collect.Generator) # a generative test yielded a non-callable fn, lineno = item.parent.getpathlineno() - if root == fn: + if root == fn: self.out.sep("_", "entrypoint: %s" %(modpath)) else: self.out.sep("_", "entrypoint: %s %s" %(root.basename, modpath)) - def repr_failure_explanation(self, excinfo, source): - try: + def repr_failure_explanation(self, excinfo, source): + try: s = str(source.getstatement(len(source)-1)) except KeyboardInterrupt: raise @@ -64,8 +64,7 @@ s = str(source[-1]) indent = " " * (4 + (len(s) - len(s.lstrip()))) # get the real exception information out - lines = excinfo.exconly(tryshort=True).split('\n') - self.out.line('>' + indent[:-1] + lines.pop(0)) - for x in lines: - self.out.line(indent + x) - return + lines = excinfo.exconly(tryshort=True).split('\n') + self.out.line('>' + indent[:-1] + lines.pop(0)) + for x in lines: + self.out.line(indent + x) Modified: py/branch/config/py/test/rsession/outcome.py ============================================================================== --- py/branch/config/py/test/rsession/outcome.py (original) +++ py/branch/config/py/test/rsession/outcome.py Tue Jan 23 16:31:13 2007 @@ -67,6 +67,11 @@ for x in "typename value traceback".split()] return "" %(" ".join(l),) + def exconly(self, tryshort=False): + """ Somehow crippled version of original one + """ + return "%s: %s" % (self.typename, self.value) + class ReprOutcome(object): def __init__(self, repr_tuple): (self.passed, self.setupfailure, excinfo, self.skipped, Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Tue Jan 23 16:31:13 2007 @@ -165,7 +165,7 @@ for index, entry in py.builtin.enumerate(traceback): self.out.line("%s: %s" % (entry.path, entry.lineno)) self.out.line(entry.source) - self.out.line("%s: %s" % (excinfo.typename, excinfo.value)) + self.presenter.repr_failure_explanation(excinfo, entry.source) def skips(self): texts = {} From cfbolz at codespeak.net Tue Jan 23 19:36:06 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 23 Jan 2007 19:36:06 +0100 (CET) Subject: [py-svn] r37226 - in py/dist/py/rest: . testing Message-ID: <20070123183606.3546E10078@code0.codespeak.net> Author: cfbolz Date: Tue Jan 23 19:36:04 2007 New Revision: 37226 Modified: py/dist/py/rest/rst.py py/dist/py/rest/testing/test_rst.py Log: make AbstractNode.join take *args Modified: py/dist/py/rest/rst.py ============================================================================== --- py/dist/py/rest/rst.py (original) +++ py/dist/py/rest/rst.py Tue Jan 23 19:36:04 2007 @@ -65,12 +65,13 @@ for arg in kwargs: setattr(self, arg, kwargs[arg]) - def join(self, child): - """ adds a child node + def join(self, *children): + """ add child nodes returns a reference to self """ - self._add(child) + for child in children: + self._add(child) return self def add(self, child): @@ -78,7 +79,6 @@ returns a reference to the child """ - self._add(child) return child def _add(self, child): Modified: py/dist/py/rest/testing/test_rst.py ============================================================================== --- py/dist/py/rest/testing/test_rst.py (original) +++ py/dist/py/rest/testing/test_rst.py Tue Jan 23 19:36:04 2007 @@ -92,6 +92,11 @@ txt = Paragraph(Text("dupa"), Text("dupa")).text() assert txt == "dupa dupa" +def test_text_join(): + txt = Paragraph(Text("worse things")) + txt = txt.join(Text("happen at sea"), Text("you know")) + assert txt.text() == "worse things happen at sea you know" + def test_paragraph_basic(): txt = Paragraph(Text('spam')).text() assert txt == 'spam' From hpk at codespeak.net Tue Jan 23 19:59:02 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 23 Jan 2007 19:59:02 +0100 (CET) Subject: [py-svn] r37227 - py/branch/config/py/test Message-ID: <20070123185902.D0B8910077@code0.codespeak.net> Author: hpk Date: Tue Jan 23 19:59:01 2007 New Revision: 37227 Modified: py/branch/config/py/test/defaultconftest.py Log: thinking about and putting some options into the "experimental" section. Modified: py/branch/config/py/test/defaultconftest.py ============================================================================== --- py/branch/config/py/test/defaultconftest.py (original) +++ py/branch/config/py/test/defaultconftest.py Tue Jan 23 19:59:01 2007 @@ -66,6 +66,24 @@ Option('', '--traceconfig', action="store_true", dest="traceconfig", default=False, help="trace considerations of conftest.py files."), + ) + + py.test.config.addoptions('EXPERIMENTAL options', + Option('', '--looponfailing', + action="store_true", dest="looponfailing", default=False, + help="loop on failing test set."), + Option('', '--exec', + action="store", dest="executable", default=None, + help="python executable to run the tests with."), + Option('-d', '--dist', + action="store_true", dest="dist", default=False, + help="use ad-hoc distributed testing (requires conftest settings)"), + Option('', '--tkinter', + action="store_true", dest="tkinter", default=False, + help="use tkinter test session frontend."), + Option('', '--box', + action="store_true", dest="boxing", + help="use boxing (running each test in external process)"), Option('-w', '--startserver', action="store_true", dest="startserver", default=False, help="start HTTP server listening on localhost:8000 for test." @@ -74,7 +92,7 @@ action="store_true", dest="runbrowser", default=False, help="run browser to point to your freshly started web server." ), - Option('-r', '--rest', + Option('', '--rest', action='store_true', dest="restreport", default=False, help="restructured text output reporting."), Option('', '--apigen', @@ -83,24 +101,6 @@ "argument pointing to a script)."), Option('', '--session', action="store", dest="session", default=None, - help="lookup sessioname in conftest.py files and use it."), - ) - - py.test.config.addoptions('EXPERIMENTAL options implying subprocesses', - Option('', '--tkinter', - action="store_true", dest="tkinter", default=False, - help="use tkinter test session frontend."), - Option('', '--dist', - action="store_true", dest="dist", default=False, - help="use ad-hoc distributed testing (requires conftest settings)"), - Option('', '--box', - action="store_true", dest="boxing", - help="use boxing (running each test in external process)"), - Option('', '--looponfailing', - action="store_true", dest="looponfailing", default=False, - help="loop on failing test set."), - Option('', '--exec', - action="store", dest="executable", default=None, - help="python executable to run the tests with."), + help="lookup given sessioname in conftest.py files and use it."), ) From hpk at codespeak.net Tue Jan 23 20:26:27 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 23 Jan 2007 20:26:27 +0100 (CET) Subject: [py-svn] r37228 - py/branch/config/py/test Message-ID: <20070123192627.AE1C31006F@code0.codespeak.net> Author: hpk Date: Tue Jan 23 20:26:25 2007 New Revision: 37228 Modified: py/branch/config/py/test/defaultconftest.py Log: streamlining options and docs some more Modified: py/branch/config/py/test/defaultconftest.py ============================================================================== --- py/branch/config/py/test/defaultconftest.py (original) +++ py/branch/config/py/test/defaultconftest.py Tue Jan 23 20:26:25 2007 @@ -77,21 +77,21 @@ help="python executable to run the tests with."), Option('-d', '--dist', action="store_true", dest="dist", default=False, - help="use ad-hoc distributed testing (requires conftest settings)"), + help="ad-hoc distribute tests across machines (requires conftest settings)"), + Option('-w', '--startserver', + action="store_true", dest="startserver", default=False, + help="starts local web server for displaying test progress.", + ), + Option('-r', '--runbrowser', + action="store_true", dest="runbrowser", default=False, + help="run browser (implies --startserver)." + ), Option('', '--tkinter', action="store_true", dest="tkinter", default=False, help="use tkinter test session frontend."), Option('', '--box', action="store_true", dest="boxing", help="use boxing (running each test in external process)"), - Option('-w', '--startserver', - action="store_true", dest="startserver", default=False, - help="start HTTP server listening on localhost:8000 for test." - ), - Option('', '--runbrowser', - action="store_true", dest="runbrowser", default=False, - help="run browser to point to your freshly started web server." - ), Option('', '--rest', action='store_true', dest="restreport", default=False, help="restructured text output reporting."), From hpk at codespeak.net Tue Jan 23 20:38:28 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 23 Jan 2007 20:38:28 +0100 (CET) Subject: [py-svn] r37229 - py/branch/config/py/test Message-ID: <20070123193828.1E2D91006E@code0.codespeak.net> Author: hpk Date: Tue Jan 23 20:38:27 2007 New Revision: 37229 Modified: py/branch/config/py/test/collect.py py/branch/config/py/test/session.py Log: not sure why this code was duplicated at all? (seems so easy to avoid it) Modified: py/branch/config/py/test/collect.py ============================================================================== --- py/branch/config/py/test/collect.py (original) +++ py/branch/config/py/test/collect.py Tue Jan 23 20:38:27 2007 @@ -190,8 +190,10 @@ newl.append(x.name) return ".".join(newl) - # XXX: Copied from session def skipbykeyword(self, keyword): + """ raise Skipped() exception if the given keyword + matches for this collector. + """ if not keyword: return chain = self.listchain() Modified: py/branch/config/py/test/session.py ============================================================================== --- py/branch/config/py/test/session.py (original) +++ py/branch/config/py/test/session.py Tue Jan 23 20:38:27 2007 @@ -91,7 +91,7 @@ if self.config.option.collectonly and isinstance(colitem, py.test.Item): return if isinstance(colitem, py.test.Item): - self.skipbykeyword(colitem) + colitem.skipbykeyword(self.config.option.keyword) res = colitem.run() if res is None: return py.test.Item.Passed() @@ -110,24 +110,6 @@ finish() return res - def skipbykeyword(self, colitem): - keyword = self.config.option.keyword - if not keyword: - return - chain = colitem.listchain() - for key in filter(None, keyword.split()): - eor = key[:1] == '-' - if eor: - key = key[1:] - if not (eor ^ self._matchonekeyword(key, chain)): - py.test.skip("test not selected by keyword %r" %(keyword,)) - - def _matchonekeyword(self, key, chain): - for subitem in chain: - if subitem.haskeyword(key): - return True - return False - class Exit(Exception): """ for immediate program exits without tracebacks and reporter/summary. """ def __init__(self, msg="unknown reason", item=None): From hpk at codespeak.net Tue Jan 23 20:44:23 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 23 Jan 2007 20:44:23 +0100 (CET) Subject: [py-svn] r37230 - py/branch/config/py/test Message-ID: <20070123194423.3D1911006E@code0.codespeak.net> Author: hpk Date: Tue Jan 23 20:44:22 2007 New Revision: 37230 Modified: py/branch/config/py/test/config.py Log: typo-level fixes Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Tue Jan 23 20:44:22 2007 @@ -233,19 +233,20 @@ # implied options if option.usepdb: if not option.nocapture: - print "--usepdb implies --nocapture" + #print "--pdb implies --nocapture" option.nocapture = True + if option.runbrowser and not option.startserver: - print "--runbrowser implies --startserver" + #print "--runbrowser implies --startserver" option.startserver = True # conflicting options if option.looponfailing and option.usepdb: - raise ValueError, "--looponfailing together with --pdb not supported yet." + raise ValueError, "--looponfailing together with --pdb not supported." if option.looponfailing and option.dist: - raise ValueError, "--looponfailing together with --dist not supported yet." + raise ValueError, "--looponfailing together with --dist not supported." if option.executable and option.usepdb: - raise ValueError, "--exec together with --pdb not supported yet." + raise ValueError, "--exec together with --pdb not supported." def gettopdir(args): From hpk at codespeak.net Tue Jan 23 21:53:57 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 23 Jan 2007 21:53:57 +0100 (CET) Subject: [py-svn] r37232 - in py/branch/config/py/path/local: . testing Message-ID: <20070123205357.780871006F@code0.codespeak.net> Author: hpk Date: Tue Jan 23 21:53:55 2007 New Revision: 37232 Modified: py/branch/config/py/path/local/local.py py/branch/config/py/path/local/testing/test_local.py Log: join() should take care to stick to normalized paths (uncovered bug by config works and fix for it) Modified: py/branch/config/py/path/local/local.py ============================================================================== --- py/branch/config/py/path/local/local.py (original) +++ py/branch/config/py/path/local/local.py Tue Jan 23 21:53:55 2007 @@ -189,7 +189,7 @@ strpath += sep strpath += arg obj = self.new() - obj.strpath = strpath + obj.strpath = os.path.normpath(strpath) return obj def __eq__(self, other): Modified: py/branch/config/py/path/local/testing/test_local.py ============================================================================== --- py/branch/config/py/path/local/testing/test_local.py (original) +++ py/branch/config/py/path/local/testing/test_local.py Tue Jan 23 21:53:55 2007 @@ -17,6 +17,13 @@ class TestLocalPath(LocalSetup, CommonFSTests): + def test_join_normpath(self): + assert self.tmpdir.join(".") == self.tmpdir + p = self.tmpdir.join("../%s" % self.tmpdir.basename) + assert p == self.tmpdir + p = self.tmpdir.join("..//%s/" % self.tmpdir.basename) + assert p == self.tmpdir + def test_gethash(self): import md5 import sha From hpk at codespeak.net Tue Jan 23 22:25:17 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 23 Jan 2007 22:25:17 +0100 (CET) Subject: [py-svn] r37235 - in py/branch/config/py/test: . testing Message-ID: <20070123212517.F250F10077@code0.codespeak.net> Author: hpk Date: Tue Jan 23 22:25:16 2007 New Revision: 37235 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/testing/test_config.py Log: added get_collector_trail method to get a representation of a collector relative to the topdir. Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Tue Jan 23 22:25:16 2007 @@ -205,6 +205,19 @@ for name, val in cmdlineopts.items(): setattr(self.option, name, val) + def get_collector_trail(self, collector): + """ provide a trail relative to the topdir, + which can be used to reconstruct the + collector (possibly on a different host + starting from a different topdir). + """ + chain = collector.listchain() + relpath = chain[0].fspath.relto(self.topdir) + if not relpath: + if self.topdir == chain[0].fspath: + relpath = '.' + return relpath, tuple([x.name for x in chain[1:]]) + # this is the one per-process instance of py.test configuration config_per_process = Config() Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Tue Jan 23 22:25:16 2007 @@ -314,6 +314,26 @@ for col in col.listchain(): assert col.config is config - - - + def test_get_collector_trail_and_back(self): + a = self.tmpdir.ensure("a", dir=1) + self.tmpdir.ensure("a", "__init__.py") + x = self.tmpdir.ensure("a", "trail.py") + config = py.test.config._reparse([x]) + col = config._getcollector(x) + trail = config.get_collector_trail(col) + assert len(trail) == 2 + assert trail[0] == a.relto(config.topdir) + assert trail[1] == ('trail.py',) + col2 = config._getcollector(trail) + assert col2.listchain() == col.listchain() + + def test_get_collector_trail_topdir_and_beyond(self): + config = py.test.config._reparse([self.tmpdir]) + col = config._getcollector(config.topdir) + trail = config.get_collector_trail(col) + assert len(trail) == 2 + assert trail[0] == '.' + assert trail[1] == () + col2 = config._getcollector(trail) + assert col2.fspath == config.topdir + assert len(col2.listchain()) == 1 From hpk at codespeak.net Tue Jan 23 22:27:01 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 23 Jan 2007 22:27:01 +0100 (CET) Subject: [py-svn] r37236 - py/branch/config/py/test Message-ID: <20070123212701.DB09110078@code0.codespeak.net> Author: hpk Date: Tue Jan 23 22:27:00 2007 New Revision: 37236 Modified: py/branch/config/py/test/defaultconftest.py Log: add '-f' as a shortcut for --looponfailing Modified: py/branch/config/py/test/defaultconftest.py ============================================================================== --- py/branch/config/py/test/defaultconftest.py (original) +++ py/branch/config/py/test/defaultconftest.py Tue Jan 23 22:27:00 2007 @@ -69,7 +69,7 @@ ) py.test.config.addoptions('EXPERIMENTAL options', - Option('', '--looponfailing', + Option('-f', '--looponfailing', action="store_true", dest="looponfailing", default=False, help="loop on failing test set."), Option('', '--exec', From hpk at codespeak.net Tue Jan 23 23:09:58 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 23 Jan 2007 23:09:58 +0100 (CET) Subject: [py-svn] r37238 - py/branch/config/py/test Message-ID: <20070123220958.C3E7110077@code0.codespeak.net> Author: hpk Date: Tue Jan 23 23:09:57 2007 New Revision: 37238 Modified: py/branch/config/py/test/config.py Log: why do it complicated? Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Tue Jan 23 23:09:57 2007 @@ -212,10 +212,7 @@ starting from a different topdir). """ chain = collector.listchain() - relpath = chain[0].fspath.relto(self.topdir) - if not relpath: - if self.topdir == chain[0].fspath: - relpath = '.' + relpath = chain[0].fspath.relto(self.topdir) or '.' return relpath, tuple([x.name for x in chain[1:]]) # this is the one per-process instance of py.test configuration From fijal at codespeak.net Tue Jan 23 23:38:47 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 23:38:47 +0100 (CET) Subject: [py-svn] r37239 - in py/branch/config/py: code test/terminal Message-ID: <20070123223847.9DC5B10077@code0.codespeak.net> Author: fijal Date: Tue Jan 23 23:38:45 2007 New Revision: 37239 Modified: py/branch/config/py/code/representation.py py/branch/config/py/test/terminal/terminal.py Log: Move minor function from terminal to representation Modified: py/branch/config/py/code/representation.py ============================================================================== --- py/branch/config/py/code/representation.py (original) +++ py/branch/config/py/code/representation.py Tue Jan 23 23:38:45 2007 @@ -68,3 +68,11 @@ self.out.line('>' + indent[:-1] + lines.pop(0)) for x in lines: self.out.line(indent + x) + + def getentrysource(self, entry): + try: + source = entry.getsource() + except py.error.ENOENT: + source = py.code.Source("[failure to get at sourcelines from %r]\n" % entry) + return source.deindent() + Modified: py/branch/config/py/test/terminal/terminal.py ============================================================================== --- py/branch/config/py/test/terminal/terminal.py (original) +++ py/branch/config/py/test/terminal/terminal.py Tue Jan 23 23:38:45 2007 @@ -290,7 +290,7 @@ self.out.line() else: self.out.line("") - source = self.getentrysource(entry) + source = self.presenter.getentrysource(entry) firstsourceline = entry.getfirstlinesource() marker_location = entry.lineno - firstsourceline if entry == last: @@ -300,7 +300,7 @@ self.presenter.repr_source(source, '>', marker_location) self.out.line("") self.out.line("[%s:%d]" %(entry.frame.code.path, entry.lineno+1)) - self.repr_locals(entry) + #self.repr_locals(entry) # trailing info if entry == last: @@ -357,13 +357,6 @@ # the following is only used by the combination '--pdb --tb=no' repr_failure_tbno = repr_failure_tbshort - def getentrysource(self, entry): - try: - source = entry.getsource() - except py.error.ENOENT: - source = py.code.Source("[failure to get at sourcelines from %r]\n" % entry) - return source.deindent() - def repr_out_err(self, colitem): for parent in colitem.listchain(): for name, obj in zip(['out', 'err'], parent.getouterr()): From fijal at codespeak.net Tue Jan 23 23:39:20 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 23:39:20 +0100 (CET) Subject: [py-svn] r37240 - in py/branch/config/py: code test Message-ID: <20070123223920.E36BE1007C@code0.codespeak.net> Author: fijal Date: Tue Jan 23 23:39:19 2007 New Revision: 37240 Added: py/branch/config/py/test/representation.py - copied unchanged from r37239, py/branch/config/py/code/representation.py Removed: py/branch/config/py/code/representation.py Log: Move this file to test directory, because it depends on ie. py.test.Item Deleted: /py/branch/config/py/code/representation.py ============================================================================== --- /py/branch/config/py/code/representation.py Tue Jan 23 23:39:19 2007 +++ (empty file) @@ -1,78 +0,0 @@ - -""" This file intends to gather all methods of representing -failures/tracebacks etc. which should be used among -all terminal-based reporters. This methods should be general, -to allow further use outside the pylib -""" - -# XXX: Probably it all should go as methods of proper -# objects - -class Presenter(object): - """ Class used for presentation of various objects, - sharing common output style - """ - def __init__(self, out, config): - """ out is a file-like object (we can write to it) - """ - assert hasattr(out, 'write') - self.out = out - self.config = config - - def repr_source(self, source, marker=">", marker_location=-1): - """ This one represents piece of source with possible - marker at requested position - """ - if isinstance(source, str): - # why the hell, string is iterable? - source = source.split("\n") - if marker_location < 0: - marker_location += len(source) - if marker_location < 0: - marker_location = 0 - if marker_location >= len(source): - marker_location = len(source) - 1 - for i in range(len(source)): - if i == marker_location: - prefix = marker + " " - else: - prefix = " " - self.out.line(prefix + source[i]) - - def repr_item_info(self, item): - """ This method represents py.test.Item info (path and module) - """ - root = item.fspath - modpath = item.getmodpath() - try: - fn, lineno = item.getpathlineno() - except TypeError: - assert isinstance(item.parent, py.test.collect.Generator) - # a generative test yielded a non-callable - fn, lineno = item.parent.getpathlineno() - if root == fn: - self.out.sep("_", "entrypoint: %s" %(modpath)) - else: - self.out.sep("_", "entrypoint: %s %s" %(root.basename, modpath)) - - def repr_failure_explanation(self, excinfo, source): - try: - s = str(source.getstatement(len(source)-1)) - except KeyboardInterrupt: - raise - except: - s = str(source[-1]) - indent = " " * (4 + (len(s) - len(s.lstrip()))) - # get the real exception information out - lines = excinfo.exconly(tryshort=True).split('\n') - self.out.line('>' + indent[:-1] + lines.pop(0)) - for x in lines: - self.out.line(indent + x) - - def getentrysource(self, entry): - try: - source = entry.getsource() - except py.error.ENOENT: - source = py.code.Source("[failure to get at sourcelines from %r]\n" % entry) - return source.deindent() - From fijal at codespeak.net Tue Jan 23 23:43:59 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 23:43:59 +0100 (CET) Subject: [py-svn] r37241 - in py/branch/config/py/test: rsession terminal Message-ID: <20070123224359.78BB810078@code0.codespeak.net> Author: fijal Date: Tue Jan 23 23:43:58 2007 New Revision: 37241 Modified: py/branch/config/py/test/rsession/reporter.py py/branch/config/py/test/terminal/terminal.py Log: Fix imports. Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Tue Jan 23 23:43:58 2007 @@ -11,7 +11,7 @@ from py.__.test.rsession import report from py.__.test.rsession import outcome from py.__.misc.terminal_helper import ansi_print, get_terminal_width -from py.__.code.representation import Presenter +from py.__.test.representation import Presenter import sys Modified: py/branch/config/py/test/terminal/terminal.py ============================================================================== --- py/branch/config/py/test/terminal/terminal.py (original) +++ py/branch/config/py/test/terminal/terminal.py Tue Jan 23 23:43:58 2007 @@ -4,7 +4,7 @@ Item = py.test.Item from py.__.test.terminal.out import getout import py.__.code.safe_repr -from py.__.code.representation import Presenter +from py.__.test.representation import Presenter def getrelpath(source, dest): base = source.common(dest) From fijal at codespeak.net Tue Jan 23 23:53:30 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 23 Jan 2007 23:53:30 +0100 (CET) Subject: [py-svn] r37242 - py/branch/config/py/test/testing Message-ID: <20070123225330.0E17A10077@code0.codespeak.net> Author: fijal Date: Tue Jan 23 23:53:28 2007 New Revision: 37242 Added: py/branch/config/py/test/testing/test_repr.py Log: Add a file for testing representation.py Added: py/branch/config/py/test/testing/test_repr.py ============================================================================== --- (empty file) +++ py/branch/config/py/test/testing/test_repr.py Tue Jan 23 23:53:28 2007 @@ -0,0 +1,22 @@ + +import py +from py.__.test.representation import Presenter +from py.__.test.terminal.out import getout +from StringIO import StringIO + +def test_repr_source(): + source = py.code.Source(""" + def f(x): + pass + """).strip() + config = py.test.config._reparse([]) + s = StringIO() + out = getout(s) + p = Presenter(out, config) + p.repr_source(source, "|", 0) + lines = s.getvalue().split("\n") + assert len(lines) == 3 + assert lines[0].startswith("|") + assert lines[0].find("def f(x)") != -1 + assert lines[1].find("pass") != -1 + From hpk at codespeak.net Wed Jan 24 00:06:25 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 00:06:25 +0100 (CET) Subject: [py-svn] r37243 - in py/branch/config/py/test: . terminal testing Message-ID: <20070123230625.BA69A10077@code0.codespeak.net> Author: hpk Date: Wed Jan 24 00:06:24 2007 New Revision: 37243 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/session.py py/branch/config/py/test/terminal/remote.py py/branch/config/py/test/testing/test_config.py Log: small step-wise cleanups Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Wed Jan 24 00:06:24 2007 @@ -26,13 +26,13 @@ class Config(object): """ central hub for dealing with configuration/initialization data. """ Option = optparse.Option - conftest = Conftest() - _initialized = False def __init__(self): self.option = CmdOptions() self._parser = optparse.OptionParser( usage="usage: %prog [options] [query] [filenames of tests]") + self.conftest = Conftest() + self._initialized = False self._overwrite_dict = {} def parse(self, args): @@ -212,7 +212,13 @@ starting from a different topdir). """ chain = collector.listchain() - relpath = chain[0].fspath.relto(self.topdir) or '.' + relpath = chain[0].fspath.relto(self.topdir) + if not relpath: + if chain[0].fspath == self.topdir: + relpath = "." + else: + raise ValueError("%r not relative to %s" + %(chain[0], self.topdir)) return relpath, tuple([x.name for x in chain[1:]]) # this is the one per-process instance of py.test configuration Modified: py/branch/config/py/test/session.py ============================================================================== --- py/branch/config/py/test/session.py (original) +++ py/branch/config/py/test/session.py Wed Jan 24 00:06:24 2007 @@ -43,7 +43,6 @@ self.header(colitems) try: for colitem in colitems: - colitem.option = self.config.option self.runtraced(colitem) except KeyboardInterrupt: raise @@ -53,9 +52,6 @@ self.footer(colitems) except Exit, ex: pass - # return [(fspath as string, [names as string])] - return [(str(item.listchain()[0].fspath), item.listnames()) - for item, outcome in self.getitemoutcomepairs(py.test.Item.Failed)] def runtraced(self, colitem): if self.shouldclose(): Modified: py/branch/config/py/test/terminal/remote.py ============================================================================== --- py/branch/config/py/test/terminal/remote.py (original) +++ py/branch/config/py/test/terminal/remote.py Wed Jan 24 00:06:24 2007 @@ -120,12 +120,14 @@ config.option.usepdb = False config.option.executable = None + session = config.initsession() + session.shouldclose = channel.isclosed if failures: cols = getfailureitems(failures) else: cols = args - session = config.initsession() - session.shouldclose = channel.isclosed - print "SLAVE: received configuration" - failures = session.main() + print "SLAVE: starting session.main()" + session.main() + failures = session.getitemoutcomepairs(py.test.Item.Failed) + failures = [config.get_collector_trail(item) for item,_ in failures] channel.send(failures) Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Wed Jan 24 00:06:24 2007 @@ -337,3 +337,6 @@ col2 = config._getcollector(trail) assert col2.fspath == config.topdir assert len(col2.listchain()) == 1 + col3 = config._getcollector(config.topdir.dirpath()) + py.test.raises(ValueError, + "config.get_collector_trail(col3)") From guido at codespeak.net Wed Jan 24 10:47:41 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 10:47:41 +0100 (CET) Subject: [py-svn] r37252 - py/dist/py/doc Message-ID: <20070124094741.1EC1A1006E@code0.codespeak.net> Author: guido Date: Wed Jan 24 10:47:39 2007 New Revision: 37252 Modified: py/dist/py/doc/misc.txt Log: Added some source links. Modified: py/dist/py/doc/misc.txt ============================================================================== --- py/dist/py/doc/misc.txt (original) +++ py/dist/py/doc/misc.txt Wed Jan 24 10:47:39 2007 @@ -85,6 +85,11 @@ Support for interaction with system utilities/binaries ====================================================== +sources: + + * :source:`py/process/` + * :source:`py/path/local/` + Currently, the py lib offers two ways to interact with system executables. :api:`py.process.cmdexec()` invokes the shell in order to execute a string. The other @@ -174,6 +179,11 @@ Python version compatibility helpers ===================================== +sources: + + * :source:`py/compat/` + * :source:`py/builtin/` + The py-lib contains some helpers that make writing scripts that work on various Python versions easier. From guido at codespeak.net Wed Jan 24 11:24:54 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 11:24:54 +0100 (CET) Subject: [py-svn] r37253 - py/dist/py/doc Message-ID: <20070124102454.B3D7B10077@code0.codespeak.net> Author: guido Date: Wed Jan 24 11:24:52 2007 New Revision: 37253 Modified: py/dist/py/doc/TODO.txt Log: Adjustments after discussions with fijal. Modified: py/dist/py/doc/TODO.txt ============================================================================== --- py/dist/py/doc/TODO.txt (original) +++ py/dist/py/doc/TODO.txt Wed Jan 24 11:24:52 2007 @@ -37,11 +37,13 @@ py.path.extpy -> py.path._extpy py.log -> py._log (pypy!) -* review py.io and write py.io.dupfile docstring +* review py.io and write py.io.dupfile docstring (XXX guido) * re-consider what to do with read and write methods of py.path classes (since there are places that check for file-ness by doing hasattr(... 'write')) + (XXX guido talk to holger) + packaging ------------------------------------- @@ -70,6 +72,8 @@ collect tracing information and call the apigen script to produce api and source code documentation + (done) + * deploy the above "py.test --apigen" run on codespeak regularly, determine directory locations and URL namespace design. @@ -77,30 +81,44 @@ with help code from py.__.rest.directive.... make sure that the txt files in py/documentation/ use it + (done XXX functions/methods) + testing ----------- -* windows tests (rev 36514 passes without errors, many skips) +* windows tests (rev 36514 passes without errors, many skips) (XXX guido) + * these should all work on 0.9 and on the py lib and pypy: - running "py.test -s" - running "py.test --pdb" - running "py.test --looponfailing" - running "py.test" distributed on some hosts -* tests should not create any tempdirectories in the source code base +* fix --box on config branch (XXX guido - find tests that depend on each other) + +* tests should not create any tempdirectories in the source code base + + + (done) * try to be as 2.2 compatible as possible (use e.g. py.builtin.enumerate instead of "enumerate" directly) + (done) + distributed testing ---------------------- * the main rsession methods should have docstrings explaining the purpose + (done) + * move RSync class to py.execnet.RSync, document its usage and features in the class and method docstrings + (done) + code quality ----------------- @@ -120,6 +138,8 @@ * document py.test's conftest.py approach (somewhat done) +* py.test fails to parse strangely formatted code after assertion failure + Missing docstrings ------------------ From guido at codespeak.net Wed Jan 24 13:29:27 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 13:29:27 +0100 (CET) Subject: [py-svn] r37254 - in py/dist/py/apigen/tracer: . testing testing/package/submodule Message-ID: <20070124122927.AC0C610078@code0.codespeak.net> Author: guido Date: Wed Jan 24 13:29:25 2007 New Revision: 37254 Modified: py/dist/py/apigen/tracer/docstorage.py py/dist/py/apigen/tracer/testing/package/submodule/__init__.py py/dist/py/apigen/tracer/testing/test_docgen.py py/dist/py/apigen/tracer/testing/test_package.py Log: Fixed (at least as far as I can tell) support for * entries in initpkg exportdefs. Modified: py/dist/py/apigen/tracer/docstorage.py ============================================================================== --- py/dist/py/apigen/tracer/docstorage.py (original) +++ py/dist/py/apigen/tracer/docstorage.py Wed Jan 24 13:29:25 2007 @@ -6,6 +6,7 @@ import py import sys import types +import inspect from py.__.apigen.tracer.description import FunctionDesc, ClassDesc, \ MethodDesc, Desc @@ -49,8 +50,9 @@ def find_desc(self, code, locals): try: # argh, very fragile specialcasing - return self.desc_cache[(code.raw, locals[code.raw.co_varnames[0]].__class__)] - except (KeyError, IndexError, AttributeError): + return self.desc_cache[(code.raw, + locals[code.raw.co_varnames[0]].__class__)] + except (KeyError, IndexError, AttributeError): # XXX hrmph return self.desc_cache.get(code.raw, None) #for desc in self.descs.values(): # if desc.has_code(frame.code.raw): @@ -115,17 +117,44 @@ def from_pkg(self, module, keep_frames=False): self.module = module - keys = module.__package__.exportdefs.keys() + defs = module.__package__.exportdefs d = {} - for key in keys: + for key, value in defs.iteritems(): chain = key.split('.') base = module for elem in chain: base = getattr(base, elem) - d[key] = base + if value[1] == '*': + d.update(self.get_star_import_tree(base, key)) + else: + d[key] = base self.from_dict(d, keep_frames) # XXX return self + + def get_star_import_tree(self, module, parentname): + """ deal with '*' entries in an initpkg situation """ + ret = {} + pkgpath = module.__package__.getpath() + for objname in dir(module): + if objname.startswith('_'): + continue # also skip __*__ attributes + obj = getattr(module, objname) + if (isinstance(obj, types.ClassType) or + isinstance(obj, types.ObjectType)): + try: + sourcefile_object = py.path.local( + inspect.getsourcefile(obj)) + except TypeError: + continue + else: + if not sourcefile_object.relto(pkgpath): + # not in this package + continue + dotted_name = '%s.%s' % (parentname, objname) + print 'adding dotted name', dotted_name + ret[dotted_name] = obj + return ret def from_module(self, func): raise NotImplementedError("From module") Modified: py/dist/py/apigen/tracer/testing/package/submodule/__init__.py ============================================================================== --- py/dist/py/apigen/tracer/testing/package/submodule/__init__.py (original) +++ py/dist/py/apigen/tracer/testing/package/submodule/__init__.py Wed Jan 24 13:29:25 2007 @@ -8,4 +8,5 @@ 'pak.mod.one': ('./pak/mod.py', 'one'), 'pak.mod.two': ('./pak/mod.py', 'nottwo'), 'notpak.notmod.notclass': ('./pak/mod.py', 'cls'), + 'somenamespace': ('./pak/mod.py', '*'), }) Modified: py/dist/py/apigen/tracer/testing/test_docgen.py ============================================================================== --- py/dist/py/apigen/tracer/testing/test_docgen.py (original) +++ py/dist/py/apigen/tracer/testing/test_docgen.py Wed Jan 24 13:29:25 2007 @@ -364,3 +364,55 @@ assert sorted(ds.descs['Foo'].getfields()) == ['__foo__', 'foo', 'trigger__foo'] +def setup_fs_project(): + temp = py.test.ensuretemp('test_get_initpkg_star_items') + temp.ensure("pkg/func.py").write(py.code.Source("""\ + def func(arg1): + "docstring" + """)) + temp.ensure('pkg/someclass.py').write(py.code.Source("""\ + class SomeClass(object): + " docstring someclass " + def __init__(self, somevar): + self.somevar = somevar + + def get_somevar(self): + " get_somevar docstring " + return self.somevar + SomeInstance = SomeClass(10) + """)) + temp.ensure('pkg/somesubclass.py').write(py.code.Source("""\ + from someclass import SomeClass + class SomeSubClass(SomeClass): + " docstring somesubclass " + def get_somevar(self): + return self.somevar + 1 + """)) + temp.ensure('pkg/somenamespace.py').write(py.code.Source("""\ + def foo(): + return 'bar' + def baz(qux): + return qux + """)) + temp.ensure("pkg/__init__.py").write(py.code.Source("""\ + from py.initpkg import initpkg + initpkg(__name__, exportdefs = { + 'main.sub.func': ("./func.py", "func"), + 'main.SomeClass': ('./someclass.py', 'SomeClass'), + 'main.SomeInstance': ('./someclass.py', 'SomeInstance'), + 'main.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), + 'main.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), + 'other': ('./somenamespace.py', '*'), + }) + """)) + return temp, 'pkg' + +def test_get_initpkg_star_items(): + pkgdir, pkgname = setup_fs_project() + py.std.sys.path.insert(0, str(pkgdir)) + pkg = __import__(pkgname) + ds = DocStorage().from_pkg(pkg) + sit = ds.get_star_import_tree(pkg.other, 'pkg.other') + print sit + assert sorted(sit.keys()) == ['pkg.other.baz', 'pkg.other.foo'] + Modified: py/dist/py/apigen/tracer/testing/test_package.py ============================================================================== --- py/dist/py/apigen/tracer/testing/test_package.py (original) +++ py/dist/py/apigen/tracer/testing/test_package.py Wed Jan 24 13:29:25 2007 @@ -23,10 +23,13 @@ def test_init(self): ds = self.ds - assert len(ds.descs) == 4 + print sorted(ds.descs.keys()) + assert len(ds.descs) == 8 assert py.builtin.sorted(ds.descs.keys()) == [ - "notpak.notmod.notclass", "notpak.notmod.notclass.__init__", - "pak.mod.one", "pak.mod.two"] + 'notpak.notmod.notclass', 'notpak.notmod.notclass.__init__', + 'pak.mod.one', 'pak.mod.two', 'somenamespace.cls', + 'somenamespace.cls.__init__', 'somenamespace.nottwo', + 'somenamespace.one'] def test_simple_call(self): ds = self.ds From fijal at codespeak.net Wed Jan 24 13:43:20 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 24 Jan 2007 13:43:20 +0100 (CET) Subject: [py-svn] r37255 - in py/branch/config/py: code test test/rsession test/terminal test/testing Message-ID: <20070124124320.2648310077@code0.codespeak.net> Author: fijal Date: Wed Jan 24 13:43:17 2007 New Revision: 37255 Modified: py/branch/config/py/code/traceback2.py py/branch/config/py/test/representation.py py/branch/config/py/test/rsession/outcome.py py/branch/config/py/test/rsession/reporter.py py/branch/config/py/test/terminal/terminal.py py/branch/config/py/test/testing/test_repr.py Log: Share the code of representing tracebacks between terminal.py and reporter.py, some tests are there in test/testing/session.py and test/rsession/testing/test_reporter.py Modified: py/branch/config/py/code/traceback2.py ============================================================================== --- py/branch/config/py/code/traceback2.py (original) +++ py/branch/config/py/code/traceback2.py Wed Jan 24 13:43:17 2007 @@ -23,6 +23,10 @@ return self.frame.code.path path = property(path, None, None, "path to the full source code") + def getlocals(self): + return self.frame.f_locals + locals = property(getlocals, None, None, "locals of underlaying frame") + def reinterpret(self): """Reinterpret the failing statement and returns a detailed information about what operations are performed.""" Modified: py/branch/config/py/test/representation.py ============================================================================== --- py/branch/config/py/test/representation.py (original) +++ py/branch/config/py/test/representation.py Wed Jan 24 13:43:17 2007 @@ -5,8 +5,7 @@ to allow further use outside the pylib """ -# XXX: Probably it all should go as methods of proper -# objects +import py class Presenter(object): """ Class used for presentation of various objects, @@ -76,3 +75,100 @@ source = py.code.Source("[failure to get at sourcelines from %r]\n" % entry) return source.deindent() + def repr_locals(self, f_locals): + if self.config.option.showlocals: + self.out.sep('- ', 'locals') + for name, value in f_locals.items(): + if name == '__builtins__': + self.out.line("__builtins__ = ") + else: + # This formatting could all be handled by the _repr() function, which is + # only repr.Repr in disguise, so is very configurable. + str_repr = py.__.code.safe_repr._repr(value) + if len(str_repr) < 70 or not isinstance(value, + (list, tuple, dict)): + self.out.line("%-10s = %s" %(name, str_repr)) + else: + self.out.line("%-10s =\\" % (name,)) + py.std.pprint.pprint(value, stream=self.out) + + def repr_failure_tblong(self, item, excinfo, traceback, out_err_reporter): + if not self.config.option.nomagic and excinfo.errisinstance(RuntimeError): + recursionindex = traceback.recursionindex() + else: + recursionindex = None + last = traceback[-1] + first = traceback[0] + for index, entry in py.builtin.enumerate(traceback): + if entry == first: + if item: + self.repr_item_info(item) + self.out.line() + else: + self.out.line("") + source = self.getentrysource(entry) + firstsourceline = entry.getfirstlinesource() + marker_location = entry.lineno - firstsourceline + if entry == last: + self.repr_source(source, 'E', marker_location) + self.repr_failure_explanation(excinfo, source) + else: + self.repr_source(source, '>', marker_location) + self.out.line("") + self.out.line("[%s:%d]" %(entry.path, entry.lineno+1)) + self.repr_locals(entry.locals) + + # trailing info + if entry == last: + out_err_reporter() + self.out.sep("_") + else: + self.out.sep("_ ") + if index == recursionindex: + self.out.line("Recursion detected (same locals & position)") + self.out.sep("!") + break + + def repr_failure_tbshort(self, item, excinfo, traceback, out_err_reporter): + # print a Python-style short traceback + if not self.config.option.nomagic and excinfo.errisinstance(RuntimeError): + recursionindex = traceback.recursionindex() + else: + recursionindex = None + last = traceback[-1] + first = traceback[0] + self.out.line() + for index, entry in py.builtin.enumerate(traceback): + code = entry.frame.code + self.out.line(' File "%s", line %d, in %s' % ( + code.raw.co_filename, entry.lineno+1, code.raw.co_name)) + try: + fullsource = entry.frame.code.fullsource + except py.error.ENOENT: + source = ["?"] + else: + try: + source = [fullsource[entry.lineno].lstrip()] + except IndexError: + source = [] + if entry == last: + if source: + self.repr_source(source, 'E') + self.repr_failure_explanation(excinfo, source) + else: + if source: + self.repr_source(source, ' ') + self.repr_locals(entry.frame.f_locals) + + # trailing info + if entry == last: + out_err_reporter() + self.out.sep("_") + else: + if index == recursionindex: + self.out.line("Recursion detected (same locals & position)") + self.out.sep("!") + break + + # the following is only used by the combination '--pdb --tb=no' + repr_failure_tbno = repr_failure_tbshort Modified: py/branch/config/py/test/rsession/outcome.py ============================================================================== --- py/branch/config/py/test/rsession/outcome.py (original) +++ py/branch/config/py/test/rsession/outcome.py Wed Jan 24 13:43:17 2007 @@ -26,7 +26,8 @@ excinfo = self.excinfo tb_info = [self.traceback_entry_repr(x, tbstyle) for x in excinfo.traceback] - return (excinfo.type.__name__, str(excinfo.value), tb_info) + rec_index = excinfo.traceback.recursionindex() + return (excinfo.type.__name__, str(excinfo.value), (tb_info, rec_index)) def traceback_entry_repr(self, tb_entry, tb_style): lineno = tb_entry.lineno @@ -53,14 +54,27 @@ relline, lineno, self.source, self.path = tbentry self.relline = int(relline) self.lineno = int(lineno) + self.locals = {} def __repr__(self): return "line %s in %s\n %s" %(self.lineno, self.path, self.source[100:]) + def getsource(self): + return py.code.Source(self.source).strip() + + def getfirstlinesource(self): + return self.lineno - self.relline + +class TracebackRepr(list): + def recursionindex(self): + return self.recursion_index + class ExcInfoRepr(object): def __init__(self, excinfo): - self.typename, self.value, tb = excinfo - self.traceback = [TracebackEntryRepr(x) for x in tb] + self.typename, self.value, tb_i = excinfo + tb, rec_index = tb_i + self.traceback = TracebackRepr([TracebackEntryRepr(x) for x in tb]) + self.traceback.recursion_index = rec_index def __repr__(self): l = ["%s=%s" %(x, getattr(self, x)) @@ -72,6 +86,14 @@ """ return "%s: %s" % (self.typename, self.value) + def errisinstance(self, exc_t): + if not isinstance(exc_t, tuple): + exc_t = (exc_t,) + for exc in exc_t: + if self.typename == str(exc).split('.')[-1]: + return True + return False + class ReprOutcome(object): def __init__(self, repr_tuple): (self.passed, self.setupfailure, excinfo, self.skipped, Modified: py/branch/config/py/test/rsession/reporter.py ============================================================================== --- py/branch/config/py/test/rsession/reporter.py (original) +++ py/branch/config/py/test/rsession/reporter.py Wed Jan 24 13:43:17 2007 @@ -113,8 +113,8 @@ host = self.gethost(event) self.out.sep('_', "%s on %s" % (" ".join(event.item.listnames()), host)) - self.presenter.repr_item_info(event.item) if event.outcome.signal: + self.presenter.repr_item_info(event.item) self.repr_signal(event.item, event.outcome) else: self.repr_failure(event.item, event.outcome) @@ -134,38 +134,22 @@ if not traceback: self.out.line("empty traceback from item %r" % (item,)) return - #handler = getattr(self, 'repr_failure_tb%s' % self.config.option.tbstyle) - self.repr_traceback(item, excinfo, traceback) + + handler = getattr(self.presenter, 'repr_failure_tb%s' % self.config.option.tbstyle) + handler(item, excinfo, traceback, lambda: self.repr_out_err(outcome)) + + def repr_out_err(self, outcome): if outcome.stdout: self.out.sep('-', " Captured process stdout: ") self.out.write(outcome.stdout) if outcome.stderr: self.out.sep('-', " Captured process stderr: ") self.out.write(outcome.stderr) - + def repr_signal(self, item, outcome): signal = outcome.signal self.out.line("Received signal: %d" % outcome.signal) - if outcome.stdout: - self.out.sep('-', " Captured process stdout: ") - self.out.write(outcome.stdout) - if outcome.stderr: - self.out.sep('-', " Captured process stderr: ") - self.out.write(outcome.stderr) - - def repr_traceback(self, item, excinfo, traceback): - if self.config.option.tbstyle == 'long': - for index, entry in py.builtin.enumerate(traceback): - self.out.sep('-') - self.out.line("%s: %s" % (entry.path, entry.lineno)) - source = entry.source.split("\n") - self.presenter.repr_source(source, marker_location= - entry.relline) - elif self.config.option.tbstyle == 'short': - for index, entry in py.builtin.enumerate(traceback): - self.out.line("%s: %s" % (entry.path, entry.lineno)) - self.out.line(entry.source) - self.presenter.repr_failure_explanation(excinfo, entry.source) + self.repr_out_err(outcome) def skips(self): texts = {} Modified: py/branch/config/py/test/terminal/terminal.py ============================================================================== --- py/branch/config/py/test/terminal/terminal.py (original) +++ py/branch/config/py/test/terminal/terminal.py Wed Jan 24 13:43:17 2007 @@ -273,89 +273,8 @@ if not traceback: self.out.line("empty traceback from item %r" % (item,)) return - handler = getattr(self, 'repr_failure_tb%s' % self.config.option.tbstyle) - handler(item, excinfo, traceback) - - def repr_failure_tblong(self, item, excinfo, traceback): - if not self.config.option.nomagic and excinfo.errisinstance(RuntimeError): - recursionindex = traceback.recursionindex() - else: - recursionindex = None - last = traceback[-1] - first = traceback[0] - for index, entry in py.builtin.enumerate(traceback): - if entry == first: - if item: - self.presenter.repr_item_info(item) - self.out.line() - else: - self.out.line("") - source = self.presenter.getentrysource(entry) - firstsourceline = entry.getfirstlinesource() - marker_location = entry.lineno - firstsourceline - if entry == last: - self.presenter.repr_source(source, 'E', marker_location) - self.presenter.repr_failure_explanation(excinfo, source) - else: - self.presenter.repr_source(source, '>', marker_location) - self.out.line("") - self.out.line("[%s:%d]" %(entry.frame.code.path, entry.lineno+1)) - #self.repr_locals(entry) - - # trailing info - if entry == last: - self.repr_out_err(item) - self.out.sep("_") - else: - self.out.sep("_ ") - if index == recursionindex: - self.out.line("Recursion detected (same locals & position)") - self.out.sep("!") - break - - def repr_failure_tbshort(self, item, excinfo, traceback): - # print a Python-style short traceback - if not self.config.option.nomagic and excinfo.errisinstance(RuntimeError): - recursionindex = traceback.recursionindex() - else: - recursionindex = None - last = traceback[-1] - first = traceback[0] - self.out.line() - for index, entry in py.builtin.enumerate(traceback): - code = entry.frame.code - self.out.line(' File "%s", line %d, in %s' % ( - code.raw.co_filename, entry.lineno+1, code.raw.co_name)) - try: - fullsource = entry.frame.code.fullsource - except py.error.ENOENT: - source = ["?"] - else: - try: - source = [fullsource[entry.lineno].lstrip()] - except IndexError: - source = [] - if entry == last: - if source: - self.presenter.repr_source(source, 'E') - self.presenter.repr_failure_explanation(excinfo, source) - else: - if source: - self.presenter.repr_source(source, ' ') - self.repr_locals(entry) - - # trailing info - if entry == last: - self.repr_out_err(item) - self.out.sep("_") - else: - if index == recursionindex: - self.out.line("Recursion detected (same locals & position)") - self.out.sep("!") - break - - # the following is only used by the combination '--pdb --tb=no' - repr_failure_tbno = repr_failure_tbshort + handler = getattr(self.presenter, 'repr_failure_tb%s' % self.config.option.tbstyle) + handler(item, excinfo, traceback, lambda : self.repr_out_err(item)) def repr_out_err(self, colitem): for parent in colitem.listchain(): @@ -363,23 +282,6 @@ if obj: self.out.sep("- ", "%s: recorded std%s" % (parent.name, name)) self.out.line(obj) - - def repr_locals(self, entry): - if self.config.option.showlocals: - self.out.sep('- ', 'locals') - for name, value in entry.frame.f_locals.items(): - if name == '__builtins__': - self.out.line("__builtins__ = ") - else: - # This formatting could all be handled by the _repr() function, which is - # only repr.Repr in disguise, so is very configurable. - str_repr = py.__.code.safe_repr._repr(value) - if len(str_repr) < 70 or not isinstance(value, - (list, tuple, dict)): - self.out.line("%-10s = %s" %(name, str_repr)) - else: - self.out.line("%-10s =\\" % (name,)) - py.std.pprint.pprint(value, stream=self.out) def repr_pythonversion(): v = py.std.sys.version_info Modified: py/branch/config/py/test/testing/test_repr.py ============================================================================== --- py/branch/config/py/test/testing/test_repr.py (original) +++ py/branch/config/py/test/testing/test_repr.py Wed Jan 24 13:43:17 2007 @@ -3,6 +3,7 @@ from py.__.test.representation import Presenter from py.__.test.terminal.out import getout from StringIO import StringIO +import sys def test_repr_source(): source = py.code.Source(""" @@ -20,3 +21,44 @@ assert lines[0].find("def f(x)") != -1 assert lines[1].find("pass") != -1 +def test_repr_failure_explanation(): + """ We check here if indentation is right + """ + def f(): + def g(): + 1/0 + try: + g() + except: + e = py.code.ExceptionInfo() + return e + config = py.test.config._reparse([]) + s = StringIO() + out = getout(s) + p = Presenter(out, config) + source = py.code.Source(f) + e = f() + p.repr_failure_explanation(e, source) + assert s.getvalue().startswith("> ") + +def test_repr_local(): + config = py.test.config._reparse(['--showlocals']) + s = StringIO() + out = getout(s) + p = Presenter(out, config) + p.repr_locals(locals()) + for key in locals().keys(): + assert s.getvalue().find(key) != -1 + +def test_repr_traceback_long(): + py.test.skip("unfinished") + config = py.test.config._reparse([]) + s = StringIO() + out = getout(s) + p = Presenter(out, config) + # errr... here we should + # a) prepare an item + # b) prepare excinfo + # c) prepare some traceback info, with few different ideas, + # like recursion detected etc. + # test it... From guido at codespeak.net Wed Jan 24 13:45:14 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 13:45:14 +0100 (CET) Subject: [py-svn] r37256 - py/dist/py/apigen Message-ID: <20070124124514.6D03610077@code0.codespeak.net> Author: guido Date: Wed Jan 24 13:45:13 2007 New Revision: 37256 Modified: py/dist/py/apigen/apigen.py py/dist/py/apigen/htmlgen.py Log: Some style fixes and small HTML tweaks, fixed source links pointing to outside the package (for methods that are defined on superclasses that live outside the package). Modified: py/dist/py/apigen/apigen.py ============================================================================== --- py/dist/py/apigen/apigen.py (original) +++ py/dist/py/apigen/apigen.py Wed Jan 24 13:45:13 2007 @@ -36,7 +36,7 @@ all_names = dsa._get_names(filter=lambda x, y: True) namespace_tree = htmlgen.create_namespace_tree(all_names) - apb = htmlgen.ApiPageBuilder(targetdir, l, dsa) + apb = htmlgen.ApiPageBuilder(targetdir, l, dsa, pkgdir) spb = htmlgen.SourcePageBuilder(targetdir, l, pkgdir) ns_data = apb.prepare_namespace_pages(namespace_tree) Modified: py/dist/py/apigen/htmlgen.py ============================================================================== --- py/dist/py/apigen/htmlgen.py (original) +++ py/dist/py/apigen/htmlgen.py Wed Jan 24 13:45:13 2007 @@ -14,7 +14,7 @@ # HTML related stuff class H(html): class Description(html.div): - style = html.Style(margin_left='10em') + style = html.Style(margin_left='15em') class NamespaceDescription(Description): pass @@ -47,10 +47,11 @@ pass class Docstring(html.div): - style = html.Style(white_space='pre') + style = html.Style(white_space='pre', min_height='3em') class Navigation(html.div): - style = html.Style(min_height='99%', float='left', margin_top='1.2em') + style = html.Style(min_height='99%', float='left', margin_top='1.2em', + overflow='auto', width='15em', white_space='nowrap') class NavigationItem(html.div): pass @@ -62,10 +63,10 @@ pass class NonPythonSource(html.pre): - style = html.Style(margin_left='10em') + style = html.Style(margin_left='15em') class DirList(html.div): - style = html.Style(margin_left='10em') + style = html.Style(margin_left='15em') class DirListItem(html.div): pass @@ -279,10 +280,12 @@ class ApiPageBuilder(AbstractPageBuilder): """ builds the html for an api docs page """ - def __init__(self, base, linker, dsa): + def __init__(self, base, linker, dsa, projroot): self.base = base self.linker = linker self.dsa = dsa + self.projroot = projroot + self.projpath = py.path.local(projroot) def build_callable_view(self, dotted_name): """ build the html for a class method """ @@ -295,13 +298,19 @@ sourcefile = inspect.getsourcefile(func) callable_source = self.dsa.get_function_source(dotted_name) + is_in_pkg = py.path.local(sourcefile).relto(self.projpath) # i assume they're both either available or unavailable(XXX ?) - if sourcefile and callable_source: + if is_in_pkg and sourcefile and callable_source: csource = H.div(H.br(), - H.a('source:', + H.a('origin: %s' % (sourcefile,), href=self.linker.get_lazyhref(sourcefile)), H.br(), H.SourceDef(H.pre(callable_source))) + elif not is_in_pkg and sourcefile and callable_source: + csource = H.div(H.br(), + H.em('origin: %s' % (sourcefile,)), + H.br(), + H.SourceDef(H.pre(callable_source))) else: csource = H.SourceDef('could not get source file') @@ -328,7 +337,7 @@ else: if sourcefile[-1] in ['o', 'c']: sourcefile = sourcefile[:-1] - sourcelink = H.div(H.a('source', + sourcelink = H.div(H.a('view source', href=self.linker.get_lazyhref(sourcefile))) docstring = cls.__doc__ @@ -354,20 +363,28 @@ snippet = H.ClassDescription( # XXX bases HTML H.ClassDef('%s(' % (clsname,), *basehtml), - sourcelink, H.Docstring(docstring or H.em('no docstring available')), + sourcelink, ) - snippet.append(H.h2('Functions:')) - for method in methods: - snippet += self.build_callable_view('%s.%s' % (dotted_name, - method)) + if methods: + snippet.append(H.h2('methods:')) + for method in methods: + snippet += self.build_callable_view('%s.%s' % (dotted_name, + method)) + # XXX properties return snippet def build_namespace_view(self, namespace_dotted_name, item_dotted_names): """ build the html for a namespace (module) """ - print 'building namespace for', namespace_dotted_name + try: + obj = self.dsa.get_obj(namespace_dotted_name) + except KeyError: + docstring = None + else: + docstring = obj.__doc__ snippet = H.NamespaceDescription( H.NamespaceDef(namespace_dotted_name), + H.Docstring(docstring or H.em('no docstring available')) ) for dotted_name in item_dotted_names: itemname = dotted_name.split('.')[-1] From fijal at codespeak.net Wed Jan 24 13:54:31 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 24 Jan 2007 13:54:31 +0100 (CET) Subject: [py-svn] r37257 - in py/branch/config/py: code test test/rsession Message-ID: <20070124125431.E36FB10077@code0.codespeak.net> Author: fijal Date: Wed Jan 24 13:54:30 2007 New Revision: 37257 Modified: py/branch/config/py/code/traceback2.py py/branch/config/py/test/representation.py py/branch/config/py/test/rsession/outcome.py Log: Yeah, but it seems that short tracebacks was not tested at all, argh argh argh. Modified: py/branch/config/py/code/traceback2.py ============================================================================== --- py/branch/config/py/code/traceback2.py (original) +++ py/branch/config/py/code/traceback2.py Wed Jan 24 13:54:30 2007 @@ -82,6 +82,10 @@ line = "" return " File %r:%d in %s\n %s\n" %(fn, self.lineno+1, name, line) + def name(self): + return self.frame.code.raw.co_name + name = property(name, None, None, "co_name of underlaying code") + class Traceback(list): """ Traceback objects encapsulate and offer higher level access to Traceback entries. Modified: py/branch/config/py/test/representation.py ============================================================================== --- py/branch/config/py/test/representation.py (original) +++ py/branch/config/py/test/representation.py Wed Jan 24 13:54:30 2007 @@ -138,17 +138,20 @@ last = traceback[-1] first = traceback[0] self.out.line() - for index, entry in py.builtin.enumerate(traceback): - code = entry.frame.code + for index, entry in py.builtin.enumerate(traceback): + path = entry.path.basename + firstsourceline = entry.getfirstlinesource() + relline = entry.lineno - firstsourceline self.out.line(' File "%s", line %d, in %s' % ( - code.raw.co_filename, entry.lineno+1, code.raw.co_name)) + path, entry.lineno+1, entry.name)) try: - fullsource = entry.frame.code.fullsource + source = entry.getsource().lines except py.error.ENOENT: source = ["?"] else: try: - source = [fullsource[entry.lineno].lstrip()] + if len(source) > 1: + source = source[relline] except IndexError: source = [] if entry == last: @@ -158,7 +161,7 @@ else: if source: self.repr_source(source, ' ') - self.repr_locals(entry.frame.f_locals) + self.repr_locals(entry.locals) # trailing info if entry == last: Modified: py/branch/config/py/test/rsession/outcome.py ============================================================================== --- py/branch/config/py/test/rsession/outcome.py (original) +++ py/branch/config/py/test/rsession/outcome.py Wed Jan 24 13:54:30 2007 @@ -38,11 +38,12 @@ source = str(tb_entry.getsource()) else: source = str(tb_entry.getsource()).split("\n")[relline] + name = tb_entry.frame.code.raw.co_name # XXX: Bare except. What can getsource() raise anyway? # SyntaxError, AttributeError, IndentationError for sure, check it #except: # source = "" - return (relline, lineno, source, path) + return (relline, lineno, source, path, name) def make_repr(self, tbstyle="long"): return (self.passed, self.setupfailure, @@ -51,8 +52,9 @@ class TracebackEntryRepr(object): def __init__(self, tbentry): - relline, lineno, self.source, self.path = tbentry + relline, lineno, self.source, self.path, self.name = tbentry self.relline = int(relline) + self.path = py.path.local(self.path) self.lineno = int(lineno) self.locals = {} From guido at codespeak.net Wed Jan 24 14:14:26 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 14:14:26 +0100 (CET) Subject: [py-svn] r37258 - in py/dist/py/apigen: . testing tracer tracer/testing tracer/testing/package/submodule Message-ID: <20070124131426.549EB10077@code0.codespeak.net> Author: guido Date: Wed Jan 24 14:14:23 2007 New Revision: 37258 Modified: py/dist/py/apigen/htmlgen.py py/dist/py/apigen/testing/test_apigen_example.py py/dist/py/apigen/tracer/docstorage.py py/dist/py/apigen/tracer/testing/package/submodule/__init__.py py/dist/py/apigen/tracer/testing/test_docgen.py py/dist/py/apigen/tracer/testing/test_package.py Log: Fixed HTML validation, fixed bug in get_star_import_tree() that made that too much stuff was reported as part of the namespace. Modified: py/dist/py/apigen/htmlgen.py ============================================================================== --- py/dist/py/apigen/htmlgen.py (original) +++ py/dist/py/apigen/htmlgen.py Wed Jan 24 14:14:23 2007 @@ -74,7 +74,6 @@ class ValueDescList(html.ul): def __init__(self, *args, **kwargs): super(H.ValueDescList, self).__init__(*args, **kwargs) - self.insert(0, html.div('where:')) class ValueDescItem(html.li): pass @@ -544,7 +543,7 @@ if next: items.append(next) valuedesc.append(H.ValueDescItem(*items)) - return valuedesc + return H.div(H.div('where:'), valuedesc) def process_type_link(self, _type): # now we do simple type dispatching and provide a link in this case Modified: py/dist/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/dist/py/apigen/testing/test_apigen_example.py (original) +++ py/dist/py/apigen/testing/test_apigen_example.py Wed Jan 24 14:14:23 2007 @@ -104,7 +104,7 @@ self.base = base = py.test.ensuretemp('%s_%s' % ( self.__class__.__name__, meth.im_func.func_name)) self.linker = linker = LinkerForTests() - self.apb = ApiPageBuilder(base, linker, self.dsa) + self.apb = ApiPageBuilder(base, linker, self.dsa, self.fs_root) self.spb = SourcePageBuilder(base, linker, self.fs_root) self.namespace_tree = create_namespace_tree(['main.sub', 'main.sub.func', @@ -123,7 +123,7 @@ pkg.main.sub.func(10) pkg.main.sub.func(pkg.main.SomeClass(10)) t.end_tracing() - apb = ApiPageBuilder(self.base, self.linker, dsa) + apb = ApiPageBuilder(self.base, self.linker, dsa, self.fs_root) snippet = apb.build_callable_view('main.sub.func') html = snippet.unicode() print html @@ -133,7 +133,7 @@ 'Class SomeClass', 'Int>', 'return value :: <None>', - 'source:', + 'origin: %s' % (self.fs_root.join('pkg/func.py'),), 'def func(arg1):', ]) _checkhtmlsnippet(html) Modified: py/dist/py/apigen/tracer/docstorage.py ============================================================================== --- py/dist/py/apigen/tracer/docstorage.py (original) +++ py/dist/py/apigen/tracer/docstorage.py Wed Jan 24 14:14:23 2007 @@ -132,9 +132,10 @@ # XXX return self - def get_star_import_tree(self, module, parentname): + def get_star_import_tree(self, module, modname): """ deal with '*' entries in an initpkg situation """ ret = {} + modpath = py.path.local(inspect.getsourcefile(module)) pkgpath = module.__package__.getpath() for objname in dir(module): if objname.startswith('_'): @@ -148,11 +149,10 @@ except TypeError: continue else: - if not sourcefile_object.relto(pkgpath): + if sourcefile_object.strpath != modpath.strpath: # not in this package continue - dotted_name = '%s.%s' % (parentname, objname) - print 'adding dotted name', dotted_name + dotted_name = '%s.%s' % (modname, objname) ret[dotted_name] = obj return ret @@ -331,3 +331,4 @@ def get_obj(self, name): return self.ds.descs[name].pyobj + Modified: py/dist/py/apigen/tracer/testing/package/submodule/__init__.py ============================================================================== --- py/dist/py/apigen/tracer/testing/package/submodule/__init__.py (original) +++ py/dist/py/apigen/tracer/testing/package/submodule/__init__.py Wed Jan 24 14:14:23 2007 @@ -8,5 +8,6 @@ 'pak.mod.one': ('./pak/mod.py', 'one'), 'pak.mod.two': ('./pak/mod.py', 'nottwo'), 'notpak.notmod.notclass': ('./pak/mod.py', 'cls'), - 'somenamespace': ('./pak/mod.py', '*'), + 'somenamespace': ('./pak/somenamespace.py', '*'), }) + Modified: py/dist/py/apigen/tracer/testing/test_docgen.py ============================================================================== --- py/dist/py/apigen/tracer/testing/test_docgen.py (original) +++ py/dist/py/apigen/tracer/testing/test_docgen.py Wed Jan 24 14:14:23 2007 @@ -389,6 +389,8 @@ return self.somevar + 1 """)) temp.ensure('pkg/somenamespace.py').write(py.code.Source("""\ + from pkg.main.sub import func + def foo(): return 'bar' def baz(qux): Modified: py/dist/py/apigen/tracer/testing/test_package.py ============================================================================== --- py/dist/py/apigen/tracer/testing/test_package.py (original) +++ py/dist/py/apigen/tracer/testing/test_package.py Wed Jan 24 14:14:23 2007 @@ -24,12 +24,11 @@ def test_init(self): ds = self.ds print sorted(ds.descs.keys()) - assert len(ds.descs) == 8 + assert len(ds.descs) == 6 assert py.builtin.sorted(ds.descs.keys()) == [ 'notpak.notmod.notclass', 'notpak.notmod.notclass.__init__', - 'pak.mod.one', 'pak.mod.two', 'somenamespace.cls', - 'somenamespace.cls.__init__', 'somenamespace.nottwo', - 'somenamespace.one'] + 'pak.mod.one', 'pak.mod.two', 'somenamespace.bar', + 'somenamespace.foo'] def test_simple_call(self): ds = self.ds From guido at codespeak.net Wed Jan 24 14:26:53 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 14:26:53 +0100 (CET) Subject: [py-svn] r37260 - py/dist/py/apigen/tracer/testing/package/submodule/pak Message-ID: <20070124132653.A0B4210077@code0.codespeak.net> Author: guido Date: Wed Jan 24 14:26:52 2007 New Revision: 37260 Added: py/dist/py/apigen/tracer/testing/package/submodule/pak/somenamespace.py Log: Oops, missing file for tracer tests. Added: py/dist/py/apigen/tracer/testing/package/submodule/pak/somenamespace.py ============================================================================== --- (empty file) +++ py/dist/py/apigen/tracer/testing/package/submodule/pak/somenamespace.py Wed Jan 24 14:26:52 2007 @@ -0,0 +1,5 @@ +def foo(x): + return x + 1 + +def bar(x): + return x + 2 From hpk at codespeak.net Wed Jan 24 14:55:01 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 14:55:01 +0100 (CET) Subject: [py-svn] r37262 - py/branch/config/py/test/rsession/testing Message-ID: <20070124135501.1BC0610077@code0.codespeak.net> Author: hpk Date: Wed Jan 24 14:55:00 2007 New Revision: 37262 Modified: py/branch/config/py/test/rsession/testing/test_rsession.py Log: fix failing test Modified: py/branch/config/py/test/rsession/testing/test_rsession.py ============================================================================== --- py/branch/config/py/test/rsession/testing/test_rsession.py (original) +++ py/branch/config/py/test/rsession/testing/test_rsession.py Wed Jan 24 14:55:00 2007 @@ -140,17 +140,17 @@ assert len(passevents) == 3 assert len(failevents) == 3 tb = failevents[0].outcome.excinfo.traceback - assert tb[0].path.find("test_one") != -1 + assert str(tb[0].path).find("test_one") != -1 assert tb[0].source.find("test_2") != -1 assert failevents[0].outcome.excinfo.typename == 'AssertionError' tb = failevents[1].outcome.excinfo.traceback - assert tb[0].path.find("test_one") != -1 + assert str(tb[0].path).find("test_one") != -1 assert tb[0].source.find("test_3") != -1 assert failevents[1].outcome.excinfo.typename == 'ValueError' assert failevents[1].outcome.excinfo.value == '23' tb = failevents[2].outcome.excinfo.traceback assert failevents[2].outcome.excinfo.typename == 'TypeError' - assert tb[0].path.find("executor") != -1 + assert str(tb[0].path).find("executor") != -1 assert tb[0].source.find("execute") != -1 def test_setup_teardown_ssh(self): From hpk at codespeak.net Wed Jan 24 14:59:23 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 14:59:23 +0100 (CET) Subject: [py-svn] r37263 - in py/branch/config/py/test: . rsession terminal testing Message-ID: <20070124135923.DEEA710077@code0.codespeak.net> Author: hpk Date: Wed Jan 24 14:59:20 2007 New Revision: 37263 Modified: py/branch/config/py/test/config.py py/branch/config/py/test/rsession/slave.py py/branch/config/py/test/terminal/remote.py py/branch/config/py/test/testing/test_config.py Log: * introduce config.initdirect() which should be the central place to perform initialization on remote nodes/sides. * fix --looponfailing (which works nicely now) * have Conftest() be an instance instead of a class-variable (avoid global state) * more thoroughly use the "config.topdir" concept (which is not neccessarily the pkgdir.dirpath()) * on merge_repr don't write values to global defaultconftest module (this gets tests failing that reuse defaultconftest module, but also we want to avoid global state in general) Modified: py/branch/config/py/test/config.py ============================================================================== --- py/branch/config/py/test/config.py (original) +++ py/branch/config/py/test/config.py Wed Jan 24 14:59:20 2007 @@ -56,13 +56,14 @@ def initdirect(self, topdir, repr, coltrails=None): assert not self._initialized self._initialized = True + self.topdir = py.path.local(topdir) self.merge_repr(repr) - self.topdir = topdir - self.args = coltrails or [] + self._coltrails = coltrails def getcolitems(self): """ return initial collectors. """ - return [self._getcollector(path) for path in self.args] + trails = getattr(self, '_coltrails', None) + return [self._getcollector(path) for path in (trails or self.args)] def _getcollector(self, path): if isinstance(path, tuple): @@ -187,7 +188,11 @@ value = getattr(self.option, name) checkmarshal(name, value) cmdlineopts[name] = value - return conftestdict, cmdlineopts + l = [] + for path in self.args: + path = py.path.local(path) + l.append(path.relto(self.topdir)) + return l, conftestdict, cmdlineopts def merge_repr(self, repr): """ merge in the conftest and cmdline option values @@ -198,10 +203,13 @@ stored on the default conftest module (last priority) and the cmdline options on self.option. """ - defaultconftest = self.conftest.getconftestmodules(None)[0] - conftestdict, cmdlineopts = repr - for name, val in conftestdict.items(): - setattr(defaultconftest, name, val) + class override: + def __init__(self, d): + self.__dict__.update(d) + args, conftestdict, cmdlineopts = repr + self.args = [self.topdir.join(x) for x in args] + self.conftest.setinitial(self.args) + self.conftest._path2confmods[None].append(override(conftestdict)) for name, val in cmdlineopts.items(): setattr(self.option, name, val) Modified: py/branch/config/py/test/rsession/slave.py ============================================================================== --- py/branch/config/py/test/rsession/slave.py (original) +++ py/branch/config/py/test/rsession/slave.py Wed Jan 24 14:59:20 2007 @@ -130,10 +130,10 @@ config = py.test.config if config._initialized: config = config._reparse([basedir]) + config.merge_repr(config_repr) else: - config.conftest.setinitial([basedir]) + config.initdirect(basedir, config_repr) #config.conftest.lget('adddefaultoptions')() - config.merge_repr(config_repr) if not config.option.nomagic: py.magic.invoke(assertion=1) mod = __import__(pkgname) Modified: py/branch/config/py/test/terminal/remote.py ============================================================================== --- py/branch/config/py/test/terminal/remote.py (original) +++ py/branch/config/py/test/terminal/remote.py Wed Jan 24 14:59:20 2007 @@ -99,7 +99,7 @@ """, stdout=self.out, stderr=self.out) print "MASTER: triggered slave terminal session ->" repr = self.config.make_repr(conftestnames=[]) - channel.send((repr, [str(x) for x in self.config.args], failures)) + channel.send((str(self.config.topdir), repr, failures)) print "MASTER: send start info" try: return channel.receive() @@ -110,22 +110,16 @@ def slaverun_TerminalSession(channel): """ we run this on the other side. """ print "SLAVE: starting" - repr, args, failures = channel.receive() + topdir, repr, failures = channel.receive() print "SLAVE: received configuration" config = py.test.config - config.args = args - config.conftest.setinitial(args) - config.merge_repr(repr) + config.initdirect(topdir, repr, failures) config.option.looponfailing = False config.option.usepdb = False config.option.executable = None session = config.initsession() session.shouldclose = channel.isclosed - if failures: - cols = getfailureitems(failures) - else: - cols = args print "SLAVE: starting session.main()" session.main() failures = session.getitemoutcomepairs(py.test.Item.Failed) Modified: py/branch/config/py/test/testing/test_config.py ============================================================================== --- py/branch/config/py/test/testing/test_config.py (original) +++ py/branch/config/py/test/testing/test_config.py Wed Jan 24 14:59:20 2007 @@ -100,8 +100,8 @@ assert gettopdir([c]) == a assert gettopdir([c, Z]) == tmp + def test_config_init_direct(): - py.test.skip("XXX partially not implemented") tmp = py.test.ensuretemp("initdirect") tmp.ensure("__init__.py") tmp.ensure("conftest.py").write("x=1 ; y=2") @@ -114,12 +114,10 @@ for col1, col2 in zip(config.getcolitems(), config2.getcolitems()): assert col1.fspath == col2.fspath py.test.raises(AssertionError, "config2.initdirect(None, None)") - config3 = py.test.config._reparse([tmp.dirpath()]) - col = config3._getcollector(hello) - # XXX write repr_colspecs(topdir, cols), - # and have it consumable by initdirect() + from py.__.test.config import Config + config3 = Config() config3.initdirect(topdir=tmp.dirpath(), repr=repr, - collectspecs=[col.listnames()]) + coltrails=[(tmp.basename, (hello.basename,))]) assert config3.getvalue('x') == 1 assert config3.getvalue('y') == 2 cols = config.getcolitems() @@ -127,8 +125,7 @@ col = cols[0] assert col.name == 'test_hello.py' assert col.parent.name == tmp.basename - assert col.parent.parent.name == tmp.dirpath().basename - assert col.parent.parent.parent is None + assert col.parent.parent is None def test_config_make_and_merge_repr(): tmp = py.test.ensuretemp("reprconfig1") From hpk at codespeak.net Wed Jan 24 15:24:02 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 15:24:02 +0100 (CET) Subject: [py-svn] r37264 - py/trunk Message-ID: <20070124142402.5677E10075@code0.codespeak.net> Author: hpk Date: Wed Jan 24 15:24:01 2007 New Revision: 37264 Added: py/trunk/ - copied from r37263, py/dist/ Log: create the new development trunk From guido at codespeak.net Wed Jan 24 17:06:38 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 17:06:38 +0100 (CET) Subject: [py-svn] r37266 - in py/trunk/py/apigen: . rest/testing testing tracer tracer/testing Message-ID: <20070124160638.7478910075@code0.codespeak.net> Author: guido Date: Wed Jan 24 17:06:35 2007 New Revision: 37266 Modified: py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/rest/testing/test_rest.py py/trunk/py/apigen/testing/test_apigen_example.py py/trunk/py/apigen/tracer/description.py py/trunk/py/apigen/tracer/testing/test_docgen.py py/trunk/py/apigen/tracer/testing/test_magic.py Log: Fixed a problem in the CallFrame code, it doesn't like py.code.Source objects (no test, sorry, didn't succeed in reproducing it from a test yet), some minor HTML changes. Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Wed Jan 24 17:06:35 2007 @@ -293,21 +293,21 @@ docstring = func.__doc__ localname = func.__name__ argdesc = get_param_htmldesc(self.linker, func) - valuedesc = self.build_callable_value_description(dotted_name) + valuedesc = self.build_callable_signature_description(dotted_name) sourcefile = inspect.getsourcefile(func) callable_source = self.dsa.get_function_source(dotted_name) - is_in_pkg = py.path.local(sourcefile).relto(self.projpath) # i assume they're both either available or unavailable(XXX ?) + is_in_pkg = self.is_in_pkg(sourcefile) if is_in_pkg and sourcefile and callable_source: csource = H.div(H.br(), - H.a('origin: %s' % (sourcefile,), + H.a('source: %s' % (sourcefile,), href=self.linker.get_lazyhref(sourcefile)), H.br(), H.SourceDef(H.pre(callable_source))) elif not is_in_pkg and sourcefile and callable_source: csource = H.div(H.br(), - H.em('origin: %s' % (sourcefile,)), + H.em('source: %s' % (sourcefile,)), H.br(), H.SourceDef(H.pre(callable_source))) else: @@ -525,25 +525,32 @@ selected)) return H.Navigation(*navitems) - def build_callable_value_description(self, dotted_name): + def build_callable_signature_description(self, dotted_name): args, retval = self.dsa.get_function_signature(dotted_name) valuedesc = H.ValueDescList() - for name, _type in args + [('return value', retval)]: - l = self.process_type_link(_type) - items = [] - next = "%s :: " % name - for item in l: - if isinstance(item, str): - next += item - else: - if next: - items.append(next) - next = "" - items.append(item) - if next: - items.append(next) - valuedesc.append(H.ValueDescItem(*items)) - return H.div(H.div('where:'), valuedesc) + for name, _type in args: + valuedesc.append(self.build_sig_value_description(name, _type)) + if retval: + retval = self.process_type_link(retval) + ret = H.div(H.div('where:'), valuedesc, H.div('return value:'), + retval or 'None') + return ret + + def build_sig_value_description(self, name, _type): + l = self.process_type_link(_type) + items = [] + next = "%s : " % name + for item in l: + if isinstance(item, str): + next += item + else: + if next: + items.append(next) + next = "" + items.append(item) + if next: + items.append(next) + return H.ValueDescItem(*items) def process_type_link(self, _type): # now we do simple type dispatching and provide a link in this case @@ -561,7 +568,11 @@ linktarget = self.linker.get_lazyhref(name) lst.append(H.a(str(_type), href=linktarget)) else: + raise IOError('do not think we ever get here?') # we should provide here some way of linking to sourcegen directly lst.append(name) return lst + def is_in_pkg(self, sourcefile): + return py.path.local(sourcefile).relto(self.projpath) + Modified: py/trunk/py/apigen/rest/testing/test_rest.py ============================================================================== --- py/trunk/py/apigen/rest/testing/test_rest.py (original) +++ py/trunk/py/apigen/rest/testing/test_rest.py Wed Jan 24 17:06:35 2007 @@ -404,6 +404,7 @@ assert -1 < source.find("x \:\: ") < call_point source = tempdir.join('method_B.a.txt').read() + py.test.skip('XXX needs to be fixed, clueless atm though') assert source.find('**origin** \: `A`_') > -1 self.check_rest(tempdir) Modified: py/trunk/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_example.py (original) +++ py/trunk/py/apigen/testing/test_apigen_example.py Wed Jan 24 17:06:35 2007 @@ -128,12 +128,13 @@ html = snippet.unicode() print html run_string_sequence_test(html, [ - 'arg1 :: AnyOf(', + 'arg1 : AnyOf(', 'href="', 'Class SomeClass', 'Int>', - 'return value :: <None>', - 'origin: %s' % (self.fs_root.join('pkg/func.py'),), + 'return value:', + '<None>', + 'source: %s' % (self.fs_root.join('pkg/func.py'),), 'def func(arg1):', ]) _checkhtmlsnippet(html) Modified: py/trunk/py/apigen/tracer/description.py ============================================================================== --- py/trunk/py/apigen/tracer/description.py (original) +++ py/trunk/py/apigen/tracer/description.py Wed Jan 24 17:06:35 2007 @@ -18,7 +18,20 @@ self.filename = frame.code.raw.co_filename self.lineno = frame.lineno self.firstlineno = frame.code.firstlineno - self.source = frame.code.source() + + fname = frame.code.raw.co_filename + if fname == '': + self.source = '' + elif hasattr(fname, '__source__'): + # is a py.code.Source object + self.source = str(fname.__source__) + # XXX should we do this? + # self.filename = fname.split('<')[1].split('>')[0] + else: + try: + self.source = frame.code.source() + except IOError: + raise IOError(self.filename) def _getval(self): return (self.filename, self.lineno) Modified: py/trunk/py/apigen/tracer/testing/test_docgen.py ============================================================================== --- py/trunk/py/apigen/tracer/testing/test_docgen.py (original) +++ py/trunk/py/apigen/tracer/testing/test_docgen.py Wed Jan 24 17:06:35 2007 @@ -390,11 +390,15 @@ """)) temp.ensure('pkg/somenamespace.py').write(py.code.Source("""\ from pkg.main.sub import func + import py def foo(): return 'bar' + def baz(qux): return qux + + quux = py.code.Source('print "foo"') """)) temp.ensure("pkg/__init__.py").write(py.code.Source("""\ from py.initpkg import initpkg @@ -409,11 +413,15 @@ """)) return temp, 'pkg' -def test_get_initpkg_star_items(): +def setup_pkg_docstorage(): pkgdir, pkgname = setup_fs_project() py.std.sys.path.insert(0, str(pkgdir)) pkg = __import__(pkgname) ds = DocStorage().from_pkg(pkg) + return pkg, ds + +def test_get_initpkg_star_items(): + pkg, ds = setup_pkg_docstorage() sit = ds.get_star_import_tree(pkg.other, 'pkg.other') print sit assert sorted(sit.keys()) == ['pkg.other.baz', 'pkg.other.foo'] Modified: py/trunk/py/apigen/tracer/testing/test_magic.py ============================================================================== --- py/trunk/py/apigen/tracer/testing/test_magic.py (original) +++ py/trunk/py/apigen/tracer/testing/test_magic.py Wed Jan 24 17:06:35 2007 @@ -3,7 +3,7 @@ """ import py -py.test.skip("These features has been disabled") +py.test.skip("These features have been disabled") from py.__.apigen.tracer.magic import trace, get_storage, stack_copier, \ DocStorageKeeper From hpk at codespeak.net Wed Jan 24 17:39:40 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:39:40 +0100 (CET) Subject: [py-svn] r37268 - py/trunk/py Message-ID: <20070124163940.D773810075@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:39:40 2007 New Revision: 37268 Added: py/trunk/py/__init__.py.merge.tmp - copied, changed from r37267, py/trunk/py/__init__.py Log: merging of file:///svn/py/branch/config/py/__init__.py revisions 36936 to 37267: ------------------------------------------------------------------------ r37129 | fijal | 2007-01-22 14:04:00 +0100 (Mon, 22 Jan 2007) | 2 lines Move rsync to execnet and expose it as py.execnet.RSync ------------------------------------------------------------------------ r37074 | hpk | 2007-01-20 21:43:52 +0100 (Sat, 20 Jan 2007) | 9 lines * config.initsession() deals with getting at a session class and initiliazing it * config._getcollector(path) gets a collector pointing to path * added lots of tests * thus remove the strange getfscollector and map2colitems logic * mark some tkinter tests as skipped * fixing things all around ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/__init__.py.merge.tmp (from r37267, py/trunk/py/__init__.py) ============================================================================== --- py/trunk/py/__init__.py (original) +++ py/trunk/py/__init__.py.merge.tmp Wed Jan 24 17:39:40 2007 @@ -32,7 +32,7 @@ 'test.compat.TestCase' : ('./test/compat.py', 'TestCase'), # configuration/initialization related test api - 'test.config' : ('./test/config.py', 'config'), + 'test.config' : ('./test/config.py', 'config_per_process'), 'test.ensuretemp' : ('./test/config.py', 'ensuretemp'), 'test.cmdline.main' : ('./test/cmdline.py', 'main'), @@ -93,6 +93,9 @@ 'execnet.PopenGateway' : ('./execnet/register.py', 'PopenGateway'), 'execnet.SshGateway' : ('./execnet/register.py', 'SshGateway'), + # execnet scripts + 'execnet.RSync' : ('./execnet/rsync.py', 'RSync'), + # input-output helping 'io.dupfile' : ('./io/dupfile.py', 'dupfile'), 'io.FDCapture' : ('./io/capture.py', 'FDCapture'), From hpk at codespeak.net Wed Jan 24 17:39:43 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:39:43 +0100 (CET) Subject: [py-svn] r37269 - py/trunk/py/test Message-ID: <20070124163943.06AE11007C@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:39:42 2007 New Revision: 37269 Added: py/trunk/py/test/config.py.merge.tmp - copied, changed from r37267, py/trunk/py/test/config.py Log: merging of file:///svn/py/branch/config/py/test/config.py revisions 36936 to 37267: ------------------------------------------------------------------------ r37263 | hpk | 2007-01-24 14:59:20 +0100 (Wed, 24 Jan 2007) | 19 lines * introduce config.initdirect() which should be the central place to perform initialization on remote nodes/sides. * fix --looponfailing (which works nicely now) * have Conftest() be an instance instead of a class-variable (avoid global state) * more thoroughly use the "config.topdir" concept (which is not neccessarily the pkgdir.dirpath()) * on merge_repr don't write values to global defaultconftest module (this gets tests failing that reuse defaultconftest module, but also we want to avoid global state in general) ------------------------------------------------------------------------ r37243 | hpk | 2007-01-24 00:06:24 +0100 (Wed, 24 Jan 2007) | 2 lines small step-wise cleanups ------------------------------------------------------------------------ r37238 | hpk | 2007-01-23 23:09:57 +0100 (Tue, 23 Jan 2007) | 2 lines why do it complicated? ------------------------------------------------------------------------ r37235 | hpk | 2007-01-23 22:25:16 +0100 (Tue, 23 Jan 2007) | 5 lines added get_collector_trail method to get a representation of a collector relative to the topdir. ------------------------------------------------------------------------ r37230 | hpk | 2007-01-23 20:44:22 +0100 (Tue, 23 Jan 2007) | 2 lines typo-level fixes ------------------------------------------------------------------------ r37193 | hpk | 2007-01-23 14:53:17 +0100 (Tue, 23 Jan 2007) | 5 lines introduced config.topdir, tests and use it from terminal/remote at least. also fix fijal's "--box" option handling a bit, but i am not sure it should stay this way at all. ------------------------------------------------------------------------ r37172 | fijal | 2007-01-23 11:26:10 +0100 (Tue, 23 Jan 2007) | 2 lines Boxing implies lsession ------------------------------------------------------------------------ r37114 | hpk | 2007-01-22 02:20:30 +0100 (Mon, 22 Jan 2007) | 6 lines streamlining initial construction of collectors (to unify topdir/pkgdir/collector handling in rsession/terminal/normal) still work in-progress with a skipped test ------------------------------------------------------------------------ r37112 | hpk | 2007-01-22 01:07:09 +0100 (Mon, 22 Jan 2007) | 3 lines * moving towards a common rootdir/root collector * adding an xxxed test ------------------------------------------------------------------------ r37110 | hpk | 2007-01-22 00:39:24 +0100 (Mon, 22 Jan 2007) | 2 lines renaming some variables for more clarity ------------------------------------------------------------------------ r37077 | hpk | 2007-01-20 22:26:52 +0100 (Sat, 20 Jan 2007) | 2 lines cleaning up fixoptions() a bit ------------------------------------------------------------------------ r37076 | hpk | 2007-01-20 22:19:42 +0100 (Sat, 20 Jan 2007) | 2 lines unskip exec and looponfailing tests, fixes for that ------------------------------------------------------------------------ r37075 | hpk | 2007-01-20 21:51:18 +0100 (Sat, 20 Jan 2007) | 2 lines remove two debug prints ------------------------------------------------------------------------ r37074 | hpk | 2007-01-20 21:43:52 +0100 (Sat, 20 Jan 2007) | 9 lines * config.initsession() deals with getting at a session class and initiliazing it * config._getcollector(path) gets a collector pointing to path * added lots of tests * thus remove the strange getfscollector and map2colitems logic * mark some tkinter tests as skipped * fixing things all around ------------------------------------------------------------------------ r37065 | arigo | 2007-01-20 17:15:10 +0100 (Sat, 20 Jan 2007) | 3 lines Choose a random free port when using the --runbrowser option, but stick to the fixed 8000 when using --startserver only. ------------------------------------------------------------------------ r37061 | hpk | 2007-01-20 16:29:25 +0100 (Sat, 20 Jan 2007) | 8 lines refactoring/fixing the remote terminal approach (used for --exec and --looponfailing) to use the new configiguration. Removes lots of strange code. XXX there are still some recursive testing issues. ------------------------------------------------------------------------ r37055 | hpk | 2007-01-20 12:51:54 +0100 (Sat, 20 Jan 2007) | 4 lines reintroducing --session to lookup custom session objects in conftests.py there is no other way to override a session object from conftests. ------------------------------------------------------------------------ r37025 | hpk | 2007-01-19 17:59:50 +0100 (Fri, 19 Jan 2007) | 2 lines remove lget and its last usage (which was a bit random) ------------------------------------------------------------------------ r37020 | hpk | 2007-01-19 17:48:15 +0100 (Fri, 19 Jan 2007) | 3 lines switching in the new way of getting to a sessionclass, removing code in cmdline.py and elsewhere accordingly ------------------------------------------------------------------------ r37013 | hpk | 2007-01-19 17:14:11 +0100 (Fri, 19 Jan 2007) | 2 lines somewhat simpler lookup mechanism for sessions ------------------------------------------------------------------------ r37009 | hpk | 2007-01-19 16:50:32 +0100 (Fri, 19 Jan 2007) | 2 lines adding a config method to determine the session name ------------------------------------------------------------------------ r36994 | fijal | 2007-01-19 15:08:16 +0100 (Fri, 19 Jan 2007) | 2 lines removal of some trailing white-spaces. ------------------------------------------------------------------------ r36964 | hpk | 2007-01-18 19:30:02 +0100 (Thu, 18 Jan 2007) | 8 lines move rconfig functionality to general Config object, with docstrings, and trying to change rsession accordingly. note that it's called "make_repr" and "merge_repr" the latter to make it obvious that we are changing the instance with the given repr. ------------------------------------------------------------------------ r36942 | hpk | 2007-01-18 16:08:06 +0100 (Thu, 18 Jan 2007) | 4 lines group things used for testing and not use non-underscore names (otherwise they are consdiered public and are possibly seen from apigen through py.test.config!) ------------------------------------------------------------------------ r36941 | fijal | 2007-01-18 15:59:08 +0100 (Thu, 18 Jan 2007) | 2 lines Add a hack which allows to temporarily overwrite the config value. ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/test/config.py.merge.tmp (from r37267, py/trunk/py/test/config.py) ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py.merge.tmp Wed Jan 24 17:39:42 2007 @@ -26,32 +26,65 @@ class Config(object): """ central hub for dealing with configuration/initialization data. """ Option = optparse.Option - conftest = Conftest() def __init__(self): self.option = CmdOptions() self._parser = optparse.OptionParser( usage="usage: %prog [options] [query] [filenames of tests]") - self._parsed = False + self.conftest = Conftest() + self._initialized = False + self._overwrite_dict = {} def parse(self, args): """ parse cmdline arguments into this config object. Note that this can only be called once per testing process. """ - assert not self._parsed, ( + assert not self._initialized, ( "can only parse cmdline args once per Config object") - self._parsed = True + self._initialized = True self.conftest.setinitial(args) - self.conftest.lget('adddefaultoptions')() + self.conftest.rget('adddefaultoptions')() args = [str(x) for x in args] - self._origargs = args - cmdlineoption, remaining = self._parser.parse_args(args) + cmdlineoption, args = self._parser.parse_args(args) self.option.__dict__.update(vars(cmdlineoption)) fixoptions(self.option) # XXX fixing should be moved to sessions - if not remaining: - remaining.append(py.std.os.getcwd()) - self.remaining = remaining - + if not args: + args.append(py.std.os.getcwd()) + self.topdir = gettopdir(args) + self.args = args + + def initdirect(self, topdir, repr, coltrails=None): + assert not self._initialized + self._initialized = True + self.topdir = py.path.local(topdir) + self.merge_repr(repr) + self._coltrails = coltrails + + def getcolitems(self): + """ return initial collectors. """ + trails = getattr(self, '_coltrails', None) + return [self._getcollector(path) for path in (trails or self.args)] + + def _getcollector(self, path): + if isinstance(path, tuple): + relpath, names = path + fspath = self.topdir.join(relpath) + col = self._getcollector(fspath) + else: + path = py.path.local(path) + assert path.check(), "%s: path does not exist" %(path,) + col = self._getrootcollector(path) + names = path.relto(col.fspath).split(path.sep) + return col.getitembynames(names) + + def _getrootcollector(self, path): + pkgpath = path.pypkgpath() + if pkgpath is None: + pkgpath = path.check(file=1) and path.dirpath() or path + col = self.conftest.rget("Directory", pkgpath)(pkgpath) + col.config = self + return col + def addoptions(self, groupname, *specs): """ add a named group of options to the current testing session. This function gets invoked during testing session initialization. @@ -70,79 +103,186 @@ if path is None, lookup the value in the initial conftest modules found during command line parsing. """ - return self.conftest.rget(name, path) + try: + return self._overwrite_dict[name] + except KeyError: + return self.conftest.rget(name, path) + + def initsession(self): + """ return an initialized session object. """ + cls = self._getsessionclass() + session = cls(self) + #session.fixoptions() + return session - def getsessionclass(self): + def _getsessionclass(self): """ return Session class determined from cmdline options and looked up in initial config modules. """ - sessionname = self.option.session + 'Session' - try: - return self.conftest.rget(sessionname) - except KeyError: - pass - sessionimportpaths = self.conftest.lget('sessionimportpaths') - importpath = sessionimportpaths[sessionname] - mod = __import__(importpath, None, None, ['__doc__']) - return getattr(mod, sessionname) + if self.option.session is not None: + return self.conftest.rget(self.option.session) + else: + name = self._getsessionname() + importpath = globals()[name] + mod = __import__(importpath, None, None, '__doc__') + return getattr(mod, name) + + def _getsessionname(self): + """ return default session name as determined from options. """ + name = 'TerminalSession' + if self.option.dist: + name = 'RSession' + elif self.option.tkinter: + name = 'TkinterSession' + else: + optnames = 'startserver runbrowser apigen restreport boxing'.split() + for opt in optnames: + if getattr(self.option, opt, False): + name = 'LSession' + break + else: + if self.getvalue('dist_boxing'): + name = 'LSession' + if self.option.looponfailing: + name = 'RemoteTerminalSession' + elif self.option.executable: + name = 'RemoteTerminalSession' + return name + + def is_boxed(self): + # XXX probably not a good idea to have this special function ... + return self.option.boxing or self.getvalue("dist_boxing") def _reparse(self, args): """ this is used from tests that want to re-invoke parse(). """ - global config - oldconfig = py.test.config + global config_per_process + oldconfig = py.test.config try: - config = py.test.config = Config() - config.parse(args) - return config + config_per_process = py.test.config = Config() + config_per_process.parse(args) + return config_per_process finally: - config = py.test.config = oldconfig + config_per_process = py.test.config = oldconfig + + def _overwrite(self, name, value): + """ this is used from tests to overwrite values irrespectives of conftests. + """ + self._overwrite_dict[name] = value + + def make_repr(self, conftestnames, optnames=None): + """ return a marshallable representation + of conftest and cmdline options. + if optnames is None, all options + on self.option will be transferred. + """ + conftestdict = {} + for name in conftestnames: + value = self.getvalue(name) + checkmarshal(name, value) + conftestdict[name] = value + cmdlineopts = {} + if optnames is None: + optnames = dir(self.option) + for name in optnames: + if not name.startswith("_"): + value = getattr(self.option, name) + checkmarshal(name, value) + cmdlineopts[name] = value + l = [] + for path in self.args: + path = py.path.local(path) + l.append(path.relto(self.topdir)) + return l, conftestdict, cmdlineopts + + def merge_repr(self, repr): + """ merge in the conftest and cmdline option values + found in the given representation (produced + by make_repr above). + + The repr-contained conftest values are + stored on the default conftest module (last + priority) and the cmdline options on self.option. + """ + class override: + def __init__(self, d): + self.__dict__.update(d) + args, conftestdict, cmdlineopts = repr + self.args = [self.topdir.join(x) for x in args] + self.conftest.setinitial(self.args) + self.conftest._path2confmods[None].append(override(conftestdict)) + for name, val in cmdlineopts.items(): + setattr(self.option, name, val) + + def get_collector_trail(self, collector): + """ provide a trail relative to the topdir, + which can be used to reconstruct the + collector (possibly on a different host + starting from a different topdir). + """ + chain = collector.listchain() + relpath = chain[0].fspath.relto(self.topdir) + if not relpath: + if chain[0].fspath == self.topdir: + relpath = "." + else: + raise ValueError("%r not relative to %s" + %(chain[0], self.topdir)) + return relpath, tuple([x.name for x in chain[1:]]) # this is the one per-process instance of py.test configuration -config = Config() +config_per_process = Config() + +# default import paths for sessions + +TkinterSession = 'py.__.test.tkinter.reportsession' +TerminalSession = 'py.__.test.terminal.terminal' +TerminalSession = 'py.__.test.terminal.terminal' +RemoteTerminalSession = 'py.__.test.terminal.remote' +RSession = 'py.__.test.rsession.rsession' +LSession = 'py.__.test.rsession.rsession' # # helpers # +def checkmarshal(name, value): + try: + py.std.marshal.dumps(value) + except ValueError: + raise ValueError("%s=%r is not marshallable" %(name, value)) + def fixoptions(option): """ sanity checks and making option values canonical. """ - if option.looponfailing and option.usepdb: - raise ValueError, "--looponfailing together with --pdb not supported yet." - if option.executable and option.usepdb: - raise ValueError, "--exec together with --pdb not supported yet." - - # setting a correct executable - remote = False - if option.executable is not None: - remote = True - exe = py.path.local(py.std.os.path.expanduser(option.executable)) - if not exe.check(): - exe = py.path.local.sysfind(option.executable) - assert exe.check() - option.executable = exe - else: - option.executable = py.std.sys.executable + # implied options if option.usepdb: if not option.nocapture: - print "--usepdb currently implies --nocapture" + #print "--pdb implies --nocapture" option.nocapture = True - # make information available about wether we should/will be remote - option._remote = remote or option.looponfailing - option._fromremote = False - - # setting a correct frontend session - if option.session: - name = option.session - elif option.tkinter: - name = 'tkinter' - else: - name = 'terminal' - name = name.capitalize() - option.session = name - if option.runbrowser and not option.startserver: - print "Cannot point browser when not starting server" + #print "--runbrowser implies --startserver" option.startserver = True - + + # conflicting options + if option.looponfailing and option.usepdb: + raise ValueError, "--looponfailing together with --pdb not supported." + if option.looponfailing and option.dist: + raise ValueError, "--looponfailing together with --dist not supported." + if option.executable and option.usepdb: + raise ValueError, "--exec together with --pdb not supported." + + +def gettopdir(args): + """ return the top directory for the given paths. + if the common base dir resides in a python package + parent directory of the root package is returned. + """ + args = [py.path.local(arg) for arg in args] + p = reduce(py.path.local.common, args) + assert p, "cannot determine common basedir of %s" %(args,) + pkgdir = p.pypkgpath() + if pkgdir is None: + return p + else: + return pkgdir.dirpath() From hpk at codespeak.net Wed Jan 24 17:39:46 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:39:46 +0100 (CET) Subject: [py-svn] r37270 - py/trunk/py/doc Message-ID: <20070124163946.B6E7F10080@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:39:46 2007 New Revision: 37270 Added: py/trunk/py/doc/TODO.txt.merge.tmp - copied, changed from r37267, py/trunk/py/doc/TODO.txt Log: merging of file:///svn/py/branch/config/py/doc/TODO.txt revisions 36936 to 37267: ------------------------------------------------------------------------ r37133 | fijal | 2007-01-22 14:15:53 +0100 (Mon, 22 Jan 2007) | 2 lines another update what has been done. ------------------------------------------------------------------------ r37132 | fijal | 2007-01-22 14:12:11 +0100 (Mon, 22 Jan 2007) | 2 lines Remove done issues. ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/doc/TODO.txt.merge.tmp (from r37267, py/trunk/py/doc/TODO.txt) ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt.merge.tmp Wed Jan 24 17:39:46 2007 @@ -94,7 +94,7 @@ - running "py.test --looponfailing" - running "py.test" distributed on some hosts -* fix --box on config branch (XXX guido - find tests that depend on each other) +* consider --box on trunk (XXX guido - find tests that depend on each other) * tests should not create any tempdirectories in the source code base @@ -109,15 +109,6 @@ distributed testing ---------------------- -* the main rsession methods should have docstrings - explaining the purpose - - (done) - -* move RSync class to py.execnet.RSync, document its usage and - features in the class and method docstrings - - (done) code quality ----------------- From hpk at codespeak.net Wed Jan 24 17:39:49 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:39:49 +0100 (CET) Subject: [py-svn] r37271 - py/trunk/py/doc Message-ID: <20070124163949.8835310088@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:39:49 2007 New Revision: 37271 Added: py/trunk/py/doc/test_conftest.py.merge.tmp - copied, changed from r37267, py/trunk/py/doc/test_conftest.py Log: merging of file:///svn/py/branch/config/py/doc/test_conftest.py revisions 36936 to 37267: ------------------------------------------------------------------------ r37074 | hpk | 2007-01-20 21:43:52 +0100 (Sat, 20 Jan 2007) | 9 lines * config.initsession() deals with getting at a session class and initiliazing it * config._getcollector(path) gets a collector pointing to path * added lots of tests * thus remove the strange getfscollector and map2colitems logic * mark some tkinter tests as skipped * fixing things all around ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/doc/test_conftest.py.merge.tmp (from r37267, py/trunk/py/doc/test_conftest.py) ============================================================================== --- py/trunk/py/doc/test_conftest.py (original) +++ py/trunk/py/doc/test_conftest.py.merge.tmp Wed Jan 24 17:39:49 2007 @@ -7,7 +7,6 @@ def test_doctest_basic(): # XXX get rid of the next line: py.magic.autopath().dirpath('conftest.py').copy(tmpdir.join('conftest.py')) - tmpdir.ensure('__init__.py') xtxt = tmpdir.join('x.txt') xtxt.write(py.code.Source(""" @@ -29,7 +28,7 @@ end """)) config = py.test.config._reparse([xtxt]) - session = config.getsessionclass()(config, py.std.sys.stdout) + session = config.initsession() session.main() l = session.getitemoutcomepairs(py.test.Item.Failed) assert len(l) == 0 @@ -47,7 +46,7 @@ .. _`blah`: javascript:some_function() """)) config = py.test.config._reparse([xtxt]) - session = config.getsessionclass()(config, py.std.sys.stdout) + session = config.initsession() session.main() l = session.getitemoutcomepairs(py.test.Item.Failed) assert len(l) == 0 From hpk at codespeak.net Wed Jan 24 17:39:53 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:39:53 +0100 (CET) Subject: [py-svn] r37272 - py/trunk/py/test/rsession Message-ID: <20070124163953.CBC311008E@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:39:52 2007 New Revision: 37272 Added: py/trunk/py/test/rsession/rest.py.merge.tmp - copied, changed from r37267, py/trunk/py/test/rsession/rest.py Log: merging of file:///svn/py/branch/config/py/test/rsession/rest.py revisions 36936 to 37267: ------------------------------------------------------------------------ r37178 | fijal | 2007-01-23 11:38:39 +0100 (Tue, 23 Jan 2007) | 2 lines Make it a bit more working. ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/test/rsession/rest.py.merge.tmp (from r37267, py/trunk/py/test/rsession/rest.py) ============================================================================== --- py/trunk/py/test/rsession/rest.py (original) +++ py/trunk/py/test/rsession/rest.py.merge.tmp Wed Jan 24 17:39:52 2007 @@ -31,18 +31,23 @@ if self.config.option.verbose: self.add_rest(Paragraph("Unknown report: %s" % what)) + def gethost(self, item): + if item.channel: + return item.channel.gateway.host + return self.hosts[0] + def report_SendItem(self, item): - address = item.channel.gateway.host.hostname + address = self.gethost(item) if self.config.option.verbose: self.add_rest(Paragraph('sending item %s to %s' % (item.item, address))) def report_HostRSyncing(self, item): - self.add_rest(LiteralBlock('%10s: RSYNC ==> %s' % (item.hostname[:10], + self.add_rest(LiteralBlock('%10s: RSYNC ==> %s' % (item.host.hostname[:10], item.remoterootpath))) def report_HostReady(self, item): - self.add_rest(LiteralBlock('%10s: READY' % (item.hostname[:10],))) + self.add_rest(LiteralBlock('%10s: READY' % (item.host.hostname[:10],))) def report_TestStarted(self, event): txt = "Running tests on hosts: %s" % ", ".join(event.hosts) @@ -91,7 +96,7 @@ self.out.write(self.rest.render_links()) def report_ReceivedItemOutcome(self, event): - host = event.channel.gateway.host + host = self.gethost(event) if event.outcome.passed: status = [Strong("PASSED")] self.passed[host] += 1 From hpk at codespeak.net Wed Jan 24 17:39:55 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:39:55 +0100 (CET) Subject: [py-svn] r37273 - py/trunk/py/test/rsession Message-ID: <20070124163955.0A8B21008E@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:39:54 2007 New Revision: 37273 Added: py/trunk/py/test/rsession/rsession.py.merge.tmp - copied, changed from r37267, py/trunk/py/test/rsession/rsession.py Log: merging of file:///svn/py/branch/config/py/test/rsession/rsession.py revisions 36936 to 37267: ------------------------------------------------------------------------ r37173 | fijal | 2007-01-23 11:26:32 +0100 (Tue, 23 Jan 2007) | 2 lines Adhere to --box option. ------------------------------------------------------------------------ r37127 | fijal | 2007-01-22 13:48:33 +0100 (Mon, 22 Jan 2007) | 2 lines Add a few docstrings. ------------------------------------------------------------------------ r37110 | hpk | 2007-01-22 00:39:24 +0100 (Mon, 22 Jan 2007) | 2 lines renaming some variables for more clarity ------------------------------------------------------------------------ r37065 | arigo | 2007-01-20 17:15:10 +0100 (Sat, 20 Jan 2007) | 3 lines Choose a random free port when using the --runbrowser option, but stick to the fixed 8000 when using --startserver only. ------------------------------------------------------------------------ r37063 | arigo | 2007-01-20 17:00:31 +0100 (Sat, 20 Jan 2007) | 5 lines webbrowser.open() may block until the browser finishes or not, so better start it from a background thread. An case where it blocks is if you define the $BROWSER environment variable. ------------------------------------------------------------------------ r37015 | fijal | 2007-01-19 17:24:32 +0100 (Fri, 19 Jan 2007) | 2 lines Major cleanup of hostmanage. Got rid of global functions in favor of some better-structured classes. ------------------------------------------------------------------------ r36988 | fijal | 2007-01-19 13:25:05 +0100 (Fri, 19 Jan 2007) | 2 lines Improve the C-c support, also keep web interface informed about crashes/interrupts. ------------------------------------------------------------------------ r36969 | fijal | 2007-01-18 20:10:36 +0100 (Thu, 18 Jan 2007) | 3 lines Move teardown hosts out of finally (needs further refactoring) Kill adddefaultoptions call for now. ------------------------------------------------------------------------ r36964 | hpk | 2007-01-18 19:30:02 +0100 (Thu, 18 Jan 2007) | 8 lines move rconfig functionality to general Config object, with docstrings, and trying to change rsession accordingly. note that it's called "make_repr" and "merge_repr" the latter to make it obvious that we are changing the instance with the given repr. ------------------------------------------------------------------------ r36962 | fijal | 2007-01-18 19:06:13 +0100 (Thu, 18 Jan 2007) | 3 lines Huge refactoring. Got rid of remote_options and session_options, two tests still fail, so it's intermediate checkin. ------------------------------------------------------------------------ r36943 | fijal | 2007-01-18 16:09:30 +0100 (Thu, 18 Jan 2007) | 3 lines at least LSession should work now. Did not touched yet the remote options stuff, but some simplifications were done. ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/test/rsession/rsession.py.merge.tmp (from r37267, py/trunk/py/test/rsession/rsession.py) ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py.merge.tmp Wed Jan 24 17:39:54 2007 @@ -11,74 +11,12 @@ from py.__.test.rsession import report from py.__.test.rsession.master import \ setup_slave, MasterNode, dispatch_loop, itemgen, randomgen -from py.__.test.rsession.hostmanage import init_hosts, teardown_hosts, HostInfo +from py.__.test.rsession.hostmanage import HostInfo, HostOptions, HostManager from py.__.test.rsession.local import local_loop, plain_runner, apigen_runner,\ - box_runner, RunnerPolicy + box_runner from py.__.test.rsession.reporter import LocalReporter, RemoteReporter -class RemoteOptions(object): - def __init__(self, d): - self.d = d - - def __getattr__(self, attr): - if attr == 'd': - return self.__dict__['d'] - return self.d[attr] - - def __setitem__(self, item, val): - self.d[item] = val - -# XXX: Must be initialised somehow -remote_options = RemoteOptions({'we_are_remote':False}) - -class SessionOptions: - defaults = { - 'max_tasks_per_node' : 15, - 'runner_policy' : 'plain_runner', - 'nice_level' : 0, - 'waittime' : 100.0, - 'import_pypy' : False, - } - - config = None - - def getvalue(self, opt): - try: - return getattr(self.config.getvalue('SessionOptions'), opt) - except (KeyError, AttributeError): - try: - return self.defaults[opt] - except KeyError: - raise AttributeError("Option %s undeclared" % opt) - - def bind_config(self, config): - self.config = config - # copy to remote session options - try: - ses_opt = self.config.getvalue('SessionOptions').__dict__ - except KeyError: - ses_opt = self.defaults - for key in self.defaults: - try: - val = ses_opt[key] - except KeyError: - val = self.defaults[key] - remote_options[key] = val - # copy to remote all options - for item, val in config.option.__dict__.items(): - remote_options[item] = val - - def __repr__(self): - return "" % self.config - - def __getattr__(self, attr): - if self.config is None: - raise AttributeError("Need to set up config first") - return self.getvalue(attr) - -session_options = SessionOptions() - class AbstractSession(object): """ An abstract session executes collectors/items through a runner. @@ -114,17 +52,29 @@ getpkgdir = staticmethod(getpkgdir) def init_reporter(self, reporter, sshhosts, reporter_class, arg=""): + """ This initialises so called `reporter` class, which will + handle all event presenting to user. Does not get called + if main received custom reporter + """ startserverflag = self.config.option.startserver restflag = self.config.option.restreport if startserverflag and reporter is None: from py.__.test.rsession.web import start_server, exported_methods + if self.config.option.runbrowser: + from socket import INADDR_ANY + port = INADDR_ANY # pick a random port when starting browser + else: + port = 8000 # stick to a fixed port otherwise reporter = exported_methods.report - start_server() + httpd = start_server(server_address = ('', port)) + port = httpd.server_port if self.config.option.runbrowser: - import webbrowser - webbrowser.open("http://localhost:8000") + import webbrowser, thread + # webbrowser.open() may block until the browser finishes or not + url = "http://localhost:%d" % (port,) + thread.start_new_thread(webbrowser.open, (url,)) elif reporter is None: if restflag: from py.__.test.rsession.rest import RestReporter @@ -150,6 +100,8 @@ reporterror = staticmethod(reporterror) def kill_server(self, startserverflag): + """ Kill web server + """ if startserverflag: from py.__.test.rsession.web import kill_server kill_server() @@ -172,6 +124,8 @@ return new_reporter, checkfun def parse_directories(sshhosts): + """ Parse sshadresses of hosts to have distinct hostname/hostdir + """ directories = {} for host in sshhosts: m = re.match("^(.*?):(.*)$", host.hostname) @@ -186,9 +140,8 @@ """ def main(self, reporter=None): """ main loop for running tests. """ - args = self.config.remaining + args = self.config.args - session_options.bind_config(self.config) sshhosts, remotepython, rsync_roots = self.read_distributed_config() reporter, startserverflag = self.init_reporter(reporter, sshhosts, RemoteReporter) @@ -198,22 +151,42 @@ pkgdir = self.getpkgdir(args[0]) done_dict = {} - nodes = init_hosts(reporter, sshhosts, pkgdir, - rsync_roots, remotepython, remote_options=remote_options.d, - optimise_localhost=self.optimise_localhost, done_dict=done_dict) - reporter(report.RsyncFinished()) - + hostopts = HostOptions(rsync_roots=rsync_roots, + remote_python=remotepython, + optimise_localhost=self.optimise_localhost) + hostmanager = HostManager(sshhosts, self.config, pkgdir, hostopts) try: - self.dispatch_tests(nodes, args, pkgdir, reporter, checkfun, done_dict) - finally: - teardown_hosts(reporter, [node.channel for node in nodes], nodes, + nodes = hostmanager.init_hosts(reporter, done_dict) + reporter(report.RsyncFinished()) + try: + self.dispatch_tests(nodes, args, pkgdir, reporter, checkfun, done_dict) + except (KeyboardInterrupt, SystemExit): + print >>sys.stderr, "C-c pressed waiting for gateways to teardown..." + channels = [node.channel for node in nodes] + hostmanager.kill_channels(channels) + hostmanager.teardown_gateways(reporter, channels) + print >>sys.stderr, "... Done" + raise + + channels = [node.channel for node in nodes] + hostmanager.teardown_hosts(reporter, channels, nodes, exitfirst=self.config.option.exitfirst) - reporter(report.Nodes(nodes)) - retval = reporter(report.TestFinished()) - self.kill_server(startserverflag) - return retval + reporter(report.Nodes(nodes)) + retval = reporter(report.TestFinished()) + self.kill_server(startserverflag) + return retval + except (KeyboardInterrupt, SystemExit): + reporter(report.InterruptedExecution()) + self.kill_server(startserverflag) + raise + except: + reporter(report.CrashedExecution()) + self.kill_server(startserverflag) + raise def read_distributed_config(self): + """ Read from conftest file the configuration of distributed testing + """ try: rsync_roots = self.config.getvalue("distrsync_roots") except: @@ -221,10 +194,7 @@ sshhosts = [HostInfo(i) for i in self.config.getvalue("disthosts")] parse_directories(sshhosts) - try: - remotepython = self.config.getvalue("dist_remotepython") - except: - remotepython = None + remotepython = self.config.getvalue("dist_remotepython") return sshhosts, remotepython, rsync_roots def dispatch_tests(self, nodes, args, pkgdir, reporter, checkfun, done_dict): @@ -247,14 +217,13 @@ """ def main(self, reporter=None, runner=None): # check out if used options makes any sense - args = self.config.remaining + args = self.config.args sshhosts = [HostInfo('localhost')] # this is just an info to reporter if not self.config.option.nomagic: py.magic.invoke(assertion=1) - session_options.bind_config(self.config) reporter, startserverflag = self.init_reporter(reporter, sshhosts, LocalReporter, args[0]) reporter, checkfun = self.wrap_reporter(reporter) @@ -321,4 +290,8 @@ self.tracer = Tracer(self.docstorage) return apigen_runner else: - return RunnerPolicy[session_options.runner_policy] + if (self.config.getvalue('dist_boxing') or self.config.option.boxing)\ + and not self.config.option.nocapture: + return box_runner + return plain_runner + From hpk at codespeak.net Wed Jan 24 17:40:03 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:40:03 +0100 (CET) Subject: [py-svn] r37274 - py/trunk/py/test/rsession Message-ID: <20070124164003.3BF7610093@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:39:56 2007 New Revision: 37274 Added: py/trunk/py/test/rsession/web.py.merge.tmp - copied, changed from r37267, py/trunk/py/test/rsession/web.py Log: merging of file:///svn/py/branch/config/py/test/rsession/web.py revisions 36936 to 37267: ------------------------------------------------------------------------ r37065 | arigo | 2007-01-20 17:15:10 +0100 (Sat, 20 Jan 2007) | 3 lines Choose a random free port when using the --runbrowser option, but stick to the fixed 8000 when using --startserver only. ------------------------------------------------------------------------ r36993 | fijal | 2007-01-19 14:54:25 +0100 (Fri, 19 Jan 2007) | 2 lines Add possibility to scroll or not to scroll to web frontend. This checkin makes me believe that there is lot of stuff to do in JS backend. ------------------------------------------------------------------------ r36955 | hpk | 2007-01-18 17:44:21 +0100 (Thu, 18 Jan 2007) | 4 lines some mods to defaultconfest dist options and use "_dist_import_pypy", i.e. a leading underscore at least ------------------------------------------------------------------------ r36943 | fijal | 2007-01-18 16:09:30 +0100 (Thu, 18 Jan 2007) | 3 lines at least LSession should work now. Did not touched yet the remote options stuff, but some simplifications were done. ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/test/rsession/web.py.merge.tmp (from r37267, py/trunk/py/test/rsession/web.py) ============================================================================== --- py/trunk/py/test/rsession/web.py (original) +++ py/trunk/py/test/rsession/web.py.merge.tmp Wed Jan 24 17:39:56 2007 @@ -14,18 +14,18 @@ import socket import py -from py.__.test.rsession.rsession import RSession, session_options +from py.__.test.rsession.rsession import RSession from py.__.test.rsession import report from py.__.test import collect from py.__.test.rsession.webdata import json DATADIR = py.path.local(__file__).dirpath("webdata") FUNCTION_LIST = ["main", "show_skip", "show_traceback", "show_info", "hide_info", - "show_host", "hide_host", "hide_messagebox"] + "show_host", "hide_host", "hide_messagebox", "opt_scroll"] try: try: - if not session_options.import_pypy: + if not py.test.config.getvalue('_dist_import_pypy'): raise ImportError except AttributeError: pass @@ -416,10 +416,10 @@ if start_new: thread.start_new_thread(httpd.serve_forever, ()) - print "Server started, listening on %s" % (server_address,) + print "Server started, listening on port %d" % (httpd.server_port,) return httpd else: - print "Server started, listening on %s" % (server_address,) + print "Server started, listening on port %d" % (httpd.server_port,) httpd.serve_forever() def kill_server(): From hpk at codespeak.net Wed Jan 24 17:40:03 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:40:03 +0100 (CET) Subject: [py-svn] r37275 - py/trunk/py/apigen/testing Message-ID: <20070124164003.8242110093@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:40:01 2007 New Revision: 37275 Added: py/trunk/py/apigen/testing/test_apigen_functional.py.merge.tmp - copied, changed from r37267, py/trunk/py/apigen/testing/test_apigen_functional.py Log: merging of file:///svn/py/branch/config/py/apigen/testing/test_apigen_functional.py revisions 36936 to 37267: ------------------------------------------------------------------------ r37020 | hpk | 2007-01-19 17:48:15 +0100 (Fri, 19 Jan 2007) | 3 lines switching in the new way of getting to a sessionclass, removing code in cmdline.py and elsewhere accordingly ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/apigen/testing/test_apigen_functional.py.merge.tmp (from r37267, py/trunk/py/apigen/testing/test_apigen_functional.py) ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py.merge.tmp Wed Jan 24 17:40:01 2007 @@ -76,7 +76,7 @@ parentdir = py.magic.autopath().dirpath().dirpath() pkgdir = fs_root.join('pkg') try: - output = py.process.cmdexec('APIGEN_TARGET="%s" py.test --session=L ' + output = py.process.cmdexec('APIGEN_TARGET="%s" py.test ' '--apigen="%s/apigen.py" "%s"' % ( tempdir, parentdir, pkgdir)) except py.error.Error, e: From hpk at codespeak.net Wed Jan 24 17:40:08 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:40:08 +0100 (CET) Subject: [py-svn] r37276 - py/trunk/py/test/rsession/testing Message-ID: <20070124164008.3B93F10098@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:40:04 2007 New Revision: 37276 Added: py/trunk/py/test/rsession/testing/test_rsession.py.merge.tmp - copied, changed from r37267, py/trunk/py/test/rsession/testing/test_rsession.py Log: merging of file:///svn/py/branch/config/py/test/rsession/testing/test_rsession.py revisions 36936 to 37267: ------------------------------------------------------------------------ r37262 | hpk | 2007-01-24 14:55:00 +0100 (Wed, 24 Jan 2007) | 2 lines fix failing test ------------------------------------------------------------------------ r37015 | fijal | 2007-01-19 17:24:32 +0100 (Fri, 19 Jan 2007) | 2 lines Major cleanup of hostmanage. Got rid of global functions in favor of some better-structured classes. ------------------------------------------------------------------------ r36974 | fijal | 2007-01-18 22:32:04 +0100 (Thu, 18 Jan 2007) | 2 lines Fix the test to actually perform RSync of pylib itself and a test if that was true. ------------------------------------------------------------------------ r36970 | hpk | 2007-01-18 20:33:16 +0100 (Thu, 18 Jan 2007) | 6 lines some little cleanups - getting rid of we_are_remote which is not used anywhere as far as i can see. maciej: please check that i didn't mess anything up, but for me the same tests as before pass ------------------------------------------------------------------------ r36968 | hpk | 2007-01-18 20:00:21 +0100 (Thu, 18 Jan 2007) | 2 lines fixing some imports ------------------------------------------------------------------------ r36966 | fijal | 2007-01-18 19:36:02 +0100 (Thu, 18 Jan 2007) | 2 lines Add try: finally: ------------------------------------------------------------------------ r36965 | fijal | 2007-01-18 19:35:00 +0100 (Thu, 18 Jan 2007) | 2 lines Fix the test. ------------------------------------------------------------------------ r36963 | fijal | 2007-01-18 19:21:43 +0100 (Thu, 18 Jan 2007) | 2 lines Fix remaining tests and make strange hack with parse/reparse. ------------------------------------------------------------------------ r36962 | fijal | 2007-01-18 19:06:13 +0100 (Thu, 18 Jan 2007) | 3 lines Huge refactoring. Got rid of remote_options and session_options, two tests still fail, so it's intermediate checkin. ------------------------------------------------------------------------ r36943 | fijal | 2007-01-18 16:09:30 +0100 (Thu, 18 Jan 2007) | 3 lines at least LSession should work now. Did not touched yet the remote options stuff, but some simplifications were done. ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/test/rsession/testing/test_rsession.py.merge.tmp (from r37267, py/trunk/py/test/rsession/testing/test_rsession.py) ============================================================================== --- py/trunk/py/test/rsession/testing/test_rsession.py (original) +++ py/trunk/py/test/rsession/testing/test_rsession.py.merge.tmp Wed Jan 24 17:40:04 2007 @@ -5,12 +5,12 @@ import py from py.__.test.rsession import report from py.__.test.rsession.rsession import RSession, parse_directories,\ - session_options, remote_options, parse_directories -from py.__.test.rsession.hostmanage import init_hosts, teardown_hosts,\ + parse_directories +from py.__.test.rsession.hostmanage import HostOptions, HostManager,\ HostInfo from py.__.test.rsession.testing.test_slave import funcfail_spec,\ funcpass_spec, funcskip_spec, funcprint_spec, funcprintfail_spec, \ - funcoptioncustom_spec, funcoption_spec + funcoptioncustom_spec def setup_module(mod): mod.pkgdir = py.path.local(py.__file__).dirpath() @@ -18,7 +18,8 @@ def test_setup_non_existing_hosts(): setup_events = [] hosts = [HostInfo("alskdjalsdkjasldkajlsd")] - cmd = "init_hosts(setup_events.append, hosts, pkgdir)" + hm = HostManager(hosts, None, pkgdir) + cmd = "hm.init_hosts(setup_events.append)" py.test.raises((py.process.cmdexec.Error, IOError, EOFError), cmd) #assert setup_events @@ -105,7 +106,7 @@ tmpdir = py.test.ensuretemp("example_distribution") tmpdir.ensure(subdir, "conftest.py").write(py.code.Source(""" disthosts = [%r] - distrsync_roots = ["%s"] + distrsync_roots = ["%s", "py"] """ % ('localhost', subdir))) tmpdir.ensure(subdir, "__init__.py") tmpdir.ensure(subdir, "test_one.py").write(py.code.Source(""" @@ -119,7 +120,11 @@ pass def test_5(): assert __file__ != '%s' - """ % str(tmpdir.join(subdir)))) + def test_6(): + import py + assert py.__file__ != '%s' + """ % (str(tmpdir.join(subdir)), py.__file__))) + tmpdir.join("py").mksymlinkto(py.path.local(py.__file__).dirpath()) args = [str(tmpdir.join(subdir))] config = py.test.config._reparse(args) rsession = RSession(config, optimise_localhost=False) @@ -131,21 +136,21 @@ passevents = [i for i in testevents if i.outcome.passed] failevents = [i for i in testevents if i.outcome.excinfo] skippedevents = [i for i in testevents if i.outcome.skipped] - assert len(testevents) == 5 - assert len(passevents) == 2 + assert len(testevents) == 6 + assert len(passevents) == 3 assert len(failevents) == 3 tb = failevents[0].outcome.excinfo.traceback - assert tb[0].path.find("test_one") != -1 + assert str(tb[0].path).find("test_one") != -1 assert tb[0].source.find("test_2") != -1 assert failevents[0].outcome.excinfo.typename == 'AssertionError' tb = failevents[1].outcome.excinfo.traceback - assert tb[0].path.find("test_one") != -1 + assert str(tb[0].path).find("test_one") != -1 assert tb[0].source.find("test_3") != -1 assert failevents[1].outcome.excinfo.typename == 'ValueError' assert failevents[1].outcome.excinfo.value == '23' tb = failevents[2].outcome.excinfo.traceback assert failevents[2].outcome.excinfo.typename == 'TypeError' - assert tb[0].path.find("executor") != -1 + assert str(tb[0].path).find("executor") != -1 assert tb[0].source.find("execute") != -1 def test_setup_teardown_ssh(self): @@ -155,10 +160,10 @@ teardown_events = [] config = py.test.config._reparse([]) - session_options.bind_config(config) - nodes = init_hosts(setup_events.append, hosts, pkgdir, - rsync_roots=["py"], optimise_localhost=False, remote_options=remote_options.d) - teardown_hosts(teardown_events.append, + opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) + hm = HostManager(hosts, config, pkgdir, opts) + nodes = hm.init_hosts(setup_events.append) + hm.teardown_hosts(teardown_events.append, [node.channel for node in nodes], nodes) count_rsyn_calls = [i for i in setup_events @@ -182,9 +187,9 @@ allevents = [] config = py.test.config._reparse([]) - session_options.bind_config(config) - nodes = init_hosts(allevents.append, hosts, pkgdir, - rsync_roots=["py"], optimise_localhost=False, remote_options=remote_options.d) + opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) + hm = HostManager(hosts, config, pkgdir, opts) + nodes = hm.init_hosts(allevents.append) from py.__.test.rsession.testing.test_executor \ import ItemTestPassing, ItemTestFailing, ItemTestSkipping @@ -202,7 +207,7 @@ node.send(itemskip) node.send(itemprint) - teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) + hm.teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) events = [i for i in allevents if isinstance(i, report.ReceivedItemOutcome)] @@ -224,31 +229,33 @@ hosts = [HostInfo('localhost')] parse_directories(hosts) config = py.test.config._reparse([]) - session_options.bind_config(config) - d = remote_options.d.copy() - d['custom'] = 'custom' - nodes = init_hosts(allevents.append, hosts, pkgdir, - rsync_roots=["py"], remote_options=d, - optimise_localhost=False) - - rootcol = py.test.collect.Directory(pkgdir.dirpath()) - itempass = rootcol.getitembynames(funcoption_spec) - itempassaswell = rootcol.getitembynames(funcoptioncustom_spec) - - for node in nodes: - node.send(itempass) - node.send(itempassaswell) - - teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) - events = [i for i in allevents - if isinstance(i, report.ReceivedItemOutcome)] - passed = [i for i in events - if i.outcome.passed] - skipped = [i for i in events - if i.outcome.skipped] - assert len(passed) == 2 * len(nodes) - assert len(skipped) == 0 - assert len(events) == len(passed) + config._overwrite('custom', 'custom') + # we need to overwrite default list to serialize + from py.__.test.rsession.master import defaultconftestnames + defaultconftestnames.append("custom") + try: + opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) + hm = HostManager(hosts, config, pkgdir, opts) + nodes = hm.init_hosts(allevents.append) + + rootcol = py.test.collect.Directory(pkgdir.dirpath()) + itempass = rootcol.getitembynames(funcoptioncustom_spec) + + for node in nodes: + node.send(itempass) + + hm.teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) + events = [i for i in allevents + if isinstance(i, report.ReceivedItemOutcome)] + passed = [i for i in events + if i.outcome.passed] + skipped = [i for i in events + if i.outcome.skipped] + assert len(passed) == 1 * len(nodes) + assert len(skipped) == 0 + assert len(events) == len(passed) + finally: + defaultconftestnames.remove("custom") def test_nice_level(self): """ Tests if nice level behaviour is ok @@ -258,14 +265,16 @@ parse_directories(hosts) tmpdir = py.test.ensuretemp("nice") tmpdir.ensure("__init__.py") - tmpdir.ensure("conftest.py").write("""disthosts = ['localhost']""") + tmpdir.ensure("conftest.py").write(py.code.Source(""" + disthosts = ['localhost'] + dist_nicelevel = 10 + """)) tmpdir.ensure("test_one.py").write("""def test_nice(): import os assert os.nice(0) == 10 """) config = py.test.config._reparse([tmpdir]) - config.option.nice_level = 10 rsession = RSession(config) allevents = [] rsession.main(reporter=allevents.append) @@ -298,7 +307,10 @@ hostnames = ['h1:/tmp', 'h1:/tmp', 'h1:/other', 'h2', 'h2:home'] hosts = [HostInfo(i) for i in hostnames] parse_directories(hosts) - init_hosts(testevents.append, hosts, pkgdir, do_sync=False) + config = py.test.config._reparse([]) + opts = HostOptions(do_sync=False, create_gateways=False) + hm = HostManager(hosts, config, pkgdir, opts) + nodes = hm.init_hosts(testevents.append) events = [i for i in testevents if isinstance(i, report.HostRSyncing)] assert len(events) == 4 assert events[0].host.hostname == 'h1' From hpk at codespeak.net Wed Jan 24 17:40:09 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:40:09 +0100 (CET) Subject: [py-svn] r37277 - py/trunk/py/test/rsession/testing Message-ID: <20070124164009.2D2F41008A@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:40:06 2007 New Revision: 37277 Added: py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp - copied, changed from r37267, py/trunk/py/test/rsession/testing/test_webjs.py Log: merging of file:///svn/py/branch/config/py/test/rsession/testing/test_webjs.py revisions 36936 to 37267: ------------------------------------------------------------------------ r36986 | fijal | 2007-01-19 13:05:58 +0100 (Fri, 19 Jan 2007) | 4 lines Improve the behaviour off cleanup and channel closing, at least on slave side. Some cleanups, got rid of some hacks (in favor of other hacks, but posix is a bit hackish anyway) ------------------------------------------------------------------------ r36943 | fijal | 2007-01-18 16:09:30 +0100 (Thu, 18 Jan 2007) | 3 lines at least LSession should work now. Did not touched yet the remote options stuff, but some simplifications were done. ------------------------------------------------------------------------ r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines Create a branch for further config cleanups. ------------------------------------------------------------------------ Copied: py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp (from r37267, py/trunk/py/test/rsession/testing/test_webjs.py) ============================================================================== --- py/trunk/py/test/rsession/testing/test_webjs.py (original) +++ py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp Wed Jan 24 17:40:06 2007 @@ -23,9 +23,7 @@ dom.window = dom.Window(html) dom.document = dom.window.document config = py.test.config._reparse([]) - from py.__.test.rsession.rsession import session_options - session_options.bind_config(config) - session_options.import_pypy = True + config._overwrite('_dist_import_pypy', True) from py.__.test.rsession import webjs from py.__.test.rsession.web import exported_methods mod.webjs = webjs From hpk at codespeak.net Wed Jan 24 17:46:48 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 17:46:48 +0100 (CET) Subject: [py-svn] r37278 - in py/trunk/py: . apigen/testing code doc doc/example execnet misc misc/testing path/local test test/rsession test/rsession/testing test/rsession/webdata test/terminal test/testing test/tkinter Message-ID: <20070124164648.8ECBD10078@code0.codespeak.net> Author: hpk Date: Wed Jan 24 17:46:46 2007 New Revision: 37278 Added: py/trunk/py/__init__.py - copied unchanged from r37277, py/trunk/py/__init__.py.merge.tmp py/trunk/py/apigen/testing/test_apigen_functional.py - copied unchanged from r37277, py/trunk/py/apigen/testing/test_apigen_functional.py.merge.tmp py/trunk/py/code/traceback2.py - copied unchanged from r37277, py/branch/config/py/code/traceback2.py py/trunk/py/doc/TODO.txt - copied unchanged from r37277, py/trunk/py/doc/TODO.txt.merge.tmp py/trunk/py/doc/example/ - copied from r37277, py/branch/config/py/doc/example/ py/trunk/py/doc/test.txt - copied unchanged from r37277, py/branch/config/py/doc/test.txt py/trunk/py/doc/test_conftest.py - copied unchanged from r37277, py/trunk/py/doc/test_conftest.py.merge.tmp py/trunk/py/execnet/ - copied from r37277, py/branch/config/py/execnet/ py/trunk/py/misc/terminal_helper.py - copied unchanged from r37277, py/branch/config/py/misc/terminal_helper.py py/trunk/py/misc/testing/test_terminal.py - copied unchanged from r37277, py/branch/config/py/misc/testing/test_terminal.py py/trunk/py/path/local/ - copied from r37277, py/branch/config/py/path/local/ py/trunk/py/test/cmdline.py - copied unchanged from r37277, py/branch/config/py/test/cmdline.py py/trunk/py/test/collect.py - copied unchanged from r37277, py/branch/config/py/test/collect.py py/trunk/py/test/config.py - copied unchanged from r37277, py/trunk/py/test/config.py.merge.tmp py/trunk/py/test/conftesthandle.py - copied unchanged from r37277, py/branch/config/py/test/conftesthandle.py py/trunk/py/test/defaultconftest.py - copied unchanged from r37277, py/branch/config/py/test/defaultconftest.py py/trunk/py/test/item.py - copied unchanged from r37277, py/branch/config/py/test/item.py py/trunk/py/test/representation.py - copied unchanged from r37277, py/branch/config/py/test/representation.py py/trunk/py/test/rsession/box.py - copied unchanged from r37277, py/branch/config/py/test/rsession/box.py py/trunk/py/test/rsession/executor.py - copied unchanged from r37277, py/branch/config/py/test/rsession/executor.py py/trunk/py/test/rsession/hostmanage.py - copied unchanged from r37277, py/branch/config/py/test/rsession/hostmanage.py py/trunk/py/test/rsession/local.py - copied unchanged from r37277, py/branch/config/py/test/rsession/local.py py/trunk/py/test/rsession/master.py - copied unchanged from r37277, py/branch/config/py/test/rsession/master.py py/trunk/py/test/rsession/outcome.py - copied unchanged from r37277, py/branch/config/py/test/rsession/outcome.py py/trunk/py/test/rsession/report.py - copied unchanged from r37277, py/branch/config/py/test/rsession/report.py py/trunk/py/test/rsession/reporter.py - copied unchanged from r37277, py/branch/config/py/test/rsession/reporter.py py/trunk/py/test/rsession/rest.py - copied unchanged from r37277, py/trunk/py/test/rsession/rest.py.merge.tmp py/trunk/py/test/rsession/rsession.py - copied unchanged from r37277, py/trunk/py/test/rsession/rsession.py.merge.tmp py/trunk/py/test/rsession/slave.py - copied unchanged from r37277, py/branch/config/py/test/rsession/slave.py py/trunk/py/test/rsession/testing/test_boxing.py - copied unchanged from r37277, py/branch/config/py/test/rsession/testing/test_boxing.py py/trunk/py/test/rsession/testing/test_executor.py - copied unchanged from r37277, py/branch/config/py/test/rsession/testing/test_executor.py py/trunk/py/test/rsession/testing/test_lsession.py - copied unchanged from r37277, py/branch/config/py/test/rsession/testing/test_lsession.py py/trunk/py/test/rsession/testing/test_master.py - copied unchanged from r37277, py/branch/config/py/test/rsession/testing/test_master.py py/trunk/py/test/rsession/testing/test_outcome.py - copied unchanged from r37277, py/branch/config/py/test/rsession/testing/test_outcome.py py/trunk/py/test/rsession/testing/test_reporter.py - copied unchanged from r37277, py/branch/config/py/test/rsession/testing/test_reporter.py py/trunk/py/test/rsession/testing/test_rest.py - copied unchanged from r37277, py/branch/config/py/test/rsession/testing/test_rest.py py/trunk/py/test/rsession/testing/test_rsession.py - copied unchanged from r37277, py/trunk/py/test/rsession/testing/test_rsession.py.merge.tmp py/trunk/py/test/rsession/testing/test_slave.py - copied unchanged from r37277, py/branch/config/py/test/rsession/testing/test_slave.py py/trunk/py/test/rsession/testing/test_web.py - copied unchanged from r37277, py/branch/config/py/test/rsession/testing/test_web.py py/trunk/py/test/rsession/testing/test_webjs.py - copied unchanged from r37277, py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp py/trunk/py/test/rsession/web.py - copied unchanged from r37277, py/trunk/py/test/rsession/web.py.merge.tmp py/trunk/py/test/rsession/webdata/ - copied from r37277, py/branch/config/py/test/rsession/webdata/ py/trunk/py/test/rsession/webjs.py - copied unchanged from r37277, py/branch/config/py/test/rsession/webjs.py py/trunk/py/test/session.py - copied unchanged from r37277, py/branch/config/py/test/session.py py/trunk/py/test/terminal/ - copied from r37277, py/branch/config/py/test/terminal/ py/trunk/py/test/testing/ - copied from r37277, py/branch/config/py/test/testing/ py/trunk/py/test/tkinter/ - copied from r37277, py/branch/config/py/test/tkinter/ Removed: py/trunk/py/__init__.py.merge.tmp py/trunk/py/apigen/testing/test_apigen_functional.py.merge.tmp py/trunk/py/doc/TODO.txt.merge.tmp py/trunk/py/doc/test_conftest.py.merge.tmp py/trunk/py/test/config.py.merge.tmp py/trunk/py/test/rsession/conftest.py py/trunk/py/test/rsession/rest.py.merge.tmp py/trunk/py/test/rsession/rsession.py.merge.tmp py/trunk/py/test/rsession/rsync.py py/trunk/py/test/rsession/rsync_remote.py py/trunk/py/test/rsession/testing/test_config.py py/trunk/py/test/rsession/testing/test_rsession.py.merge.tmp py/trunk/py/test/rsession/testing/test_rsync.py py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp py/trunk/py/test/rsession/web.py.merge.tmp Log: move files from branch to trunk (and thus complete the merge of the config branch into the trunk) Deleted: /py/trunk/py/__init__.py.merge.tmp ============================================================================== --- /py/trunk/py/__init__.py.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,132 +0,0 @@ -"""\ -the py lib is a development support library featuring -py.test, an interactive testing tool which supports -unit-testing with practically no boilerplate. -""" -from initpkg import initpkg - -version = "0.8.80-alpha2" - -initpkg(__name__, - description = "py.test and the py lib", - revision = int('$LastChangedRevision$'.split(':')[1][:-1]), - lastchangedate = '$LastChangedDate$', - version = version, - url = "http://codespeak.net/py", - download_url = "http://codespeak.net/download/py/%s.tar.gz" %(version,), - license = "MIT license", - platforms = ['unix', 'linux', 'cygwin'], - author = "holger krekel & others", - author_email = "py-dev at codespeak.net", - long_description = globals()['__doc__'], - - exportdefs = { - '_dist.setup' : ('./misc/_dist.py', 'setup'), - - # helpers for use from test functions or collectors - '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.compat.TestCase' : ('./test/compat.py', 'TestCase'), - - # configuration/initialization related test api - 'test.config' : ('./test/config.py', 'config_per_process'), - 'test.ensuretemp' : ('./test/config.py', 'ensuretemp'), - 'test.cmdline.main' : ('./test/cmdline.py', 'main'), - - # 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.Item' : ('./test/item.py', 'Item'), - 'test.Function' : ('./test/item.py', 'Function'), - - # thread related API (still in early design phase) - '_thread.WorkerPool' : ('./thread/pool.py', 'WorkerPool'), - '_thread.NamedThreadPool' : ('./thread/pool.py', 'NamedThreadPool'), - '_thread.ThreadOut' : ('./thread/io.py', 'ThreadOut'), - - # hook into the top-level standard library - 'std' : ('./misc/std.py', 'std'), - - 'process.cmdexec' : ('./process/cmdexec.py', 'cmdexec'), - - # path implementations - 'path.svnwc' : ('./path/svn/wccommand.py', 'SvnWCCommandPath'), - 'path.svnurl' : ('./path/svn/urlcommand.py', 'SvnCommandPath'), - 'path.local' : ('./path/local/local.py', 'LocalPath'), - 'path.extpy' : ('./path/extpy/extpy.py', 'Extpy'), - - # some nice slightly magic APIs - 'magic.greenlet' : ('./magic/greenlet.py', 'greenlet'), - 'magic.invoke' : ('./magic/invoke.py', 'invoke'), - 'magic.revoke' : ('./magic/invoke.py', 'revoke'), - 'magic.patch' : ('./magic/patch.py', 'patch'), - 'magic.revert' : ('./magic/patch.py', 'revert'), - 'magic.autopath' : ('./magic/autopath.py', 'autopath'), - 'magic.AssertionError' : ('./magic/assertion.py', 'AssertionError'), - - # python inspection/code-generation API - 'code.compile' : ('./code/source.py', 'compile_'), - 'code.Source' : ('./code/source.py', 'Source'), - 'code.Code' : ('./code/code.py', 'Code'), - 'code.Frame' : ('./code/frame.py', 'Frame'), - 'code.ExceptionInfo' : ('./code/excinfo.py', 'ExceptionInfo'), - 'code.Traceback' : ('./code/traceback2.py', 'Traceback'), - - # backports and additions of builtins - 'builtin.enumerate' : ('./builtin/enumerate.py', 'enumerate'), - 'builtin.reversed' : ('./builtin/reversed.py', 'reversed'), - 'builtin.sorted' : ('./builtin/sorted.py', 'sorted'), - 'builtin.BaseException' : ('./builtin/exception.py', 'BaseException'), - 'builtin.set' : ('./builtin/set.py', 'set'), - 'builtin.frozenset' : ('./builtin/set.py', 'frozenset'), - - # gateways into remote contexts - 'execnet.SocketGateway' : ('./execnet/register.py', 'SocketGateway'), - 'execnet.PopenGateway' : ('./execnet/register.py', 'PopenGateway'), - 'execnet.SshGateway' : ('./execnet/register.py', 'SshGateway'), - - # execnet scripts - 'execnet.RSync' : ('./execnet/rsync.py', 'RSync'), - - # input-output helping - 'io.dupfile' : ('./io/dupfile.py', 'dupfile'), - 'io.FDCapture' : ('./io/capture.py', 'FDCapture'), - 'io.OutErrCapture' : ('./io/capture.py', 'OutErrCapture'), - 'io.callcapture' : ('./io/capture.py', 'callcapture'), - - # error module, defining all errno's as Classes - 'error' : ('./misc/error.py', 'error'), - - # small and mean xml/html generation - 'xml.html' : ('./xmlobj/html.py', 'html'), - 'xml.Tag' : ('./xmlobj/xml.py', 'Tag'), - 'xml.raw' : ('./xmlobj/xml.py', 'raw'), - 'xml.Namespace' : ('./xmlobj/xml.py', 'Namespace'), - 'xml.escape' : ('./xmlobj/misc.py', 'escape'), - - # logging API ('producers' and 'consumers' connected via keywords) - 'log.Producer' : ('./log/producer.py', 'Producer'), - 'log.default' : ('./log/producer.py', 'default'), - 'log._getstate' : ('./log/producer.py', '_getstate'), - 'log._setstate' : ('./log/producer.py', '_setstate'), - 'log.setconsumer' : ('./log/consumer.py', 'setconsumer'), - 'log.Path' : ('./log/consumer.py', 'Path'), - 'log.STDOUT' : ('./log/consumer.py', 'STDOUT'), - 'log.STDERR' : ('./log/consumer.py', 'STDERR'), - 'log.Syslog' : ('./log/consumer.py', 'Syslog'), - 'log.get' : ('./log/logger.py', 'get'), - - # compatibility modules (taken from 2.4.4) - 'compat.doctest' : ('./compat/doctest.py', '*'), - 'compat.optparse' : ('./compat/optparse.py', '*'), - 'compat.textwrap' : ('./compat/textwrap.py', '*'), - 'compat.subprocess' : ('./compat/subprocess.py', '*'), -}) Deleted: /py/trunk/py/apigen/testing/test_apigen_functional.py.merge.tmp ============================================================================== --- /py/trunk/py/apigen/testing/test_apigen_functional.py.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,116 +0,0 @@ -""" functional test for apigen.py - - script to build api + source docs from py.test -""" - -import py - -def setup_fs_project(): - temp = py.test.ensuretemp('apigen_functional') - temp.ensure("pkg/func.py").write(py.code.Source("""\ - def func(arg1): - "docstring" - - def func_2(arg1, arg2): - return arg1(arg2) - """)) - temp.ensure('pkg/sometestclass.py').write(py.code.Source("""\ - class SomeTestClass(object): - " docstring sometestclass " - def __init__(self, somevar): - self.somevar = somevar - - def get_somevar(self): - " get_somevar docstring " - return self.somevar - """)) - temp.ensure('pkg/sometestsubclass.py').write(py.code.Source("""\ - from sometestclass import SomeTestClass - class SomeTestSubClass(SomeTestClass): - " docstring sometestsubclass " - def get_somevar(self): - return self.somevar + 1 - """)) - temp.ensure('pkg/somenamespace.py').write(py.code.Source("""\ - def foo(): - return 'bar' - def baz(qux): - return qux - """)) - temp.ensure("pkg/__init__.py").write(py.code.Source("""\ - from py.initpkg import initpkg - initpkg(__name__, exportdefs = { - 'main.sub.func': ("./func.py", "func"), - 'main.func': ("./func.py", "func_2"), - 'main.SomeTestClass': ('./sometestclass.py', 'SomeTestClass'), - 'main.SomeTestSubClass': ('./sometestsubclass.py', - 'SomeTestSubClass'), - }) - """)) - temp.ensure('pkg/test/test_pkg.py').write(py.code.Source("""\ - import py - py.std.sys.path.insert(0, - py.magic.autopath().dirpath().dirpath().dirpath().strpath) - import pkg - - # this mainly exists to provide some data to the tracer - def test_pkg(): - s = pkg.main.SomeTestClass(10) - assert s.get_somevar() == 10 - s = pkg.main.SomeTestClass('10') - assert s.get_somevar() == '10' - s = pkg.main.SomeTestSubClass(10) - assert s.get_somevar() == 11 - s = pkg.main.SomeTestSubClass('10') - py.test.raises(TypeError, 's.get_somevar()') - assert pkg.main.sub.func(10) is None - assert pkg.main.sub.func(20) is None - s = pkg.main.func(pkg.main.SomeTestClass, 10) - assert isinstance(s, pkg.main.SomeTestClass) - """)) - return temp, 'pkg' - -def test_apigen_functional(): - fs_root, package_name = setup_fs_project() - tempdir = py.test.ensuretemp('test_apigen_functional_results') - parentdir = py.magic.autopath().dirpath().dirpath() - pkgdir = fs_root.join('pkg') - try: - output = py.process.cmdexec('APIGEN_TARGET="%s" py.test ' - '--apigen="%s/apigen.py" "%s"' % ( - tempdir, parentdir, pkgdir)) - except py.error.Error, e: - print e.out - raise - assert output.lower().find('traceback') == -1 - - # just some quick content checks - apidir = tempdir.join('api') - assert apidir.check(dir=True) - sometestclass_api = apidir.join('main.SomeTestClass.html') - assert sometestclass_api.check(file=True) - html = sometestclass_api.read() - assert 'SomeTestClass' in html - # XXX not linking to method files anymore - #sometestclass_init_api = apidir.join('main.SomeTestClass.__init__.html') - #assert sometestclass_init_api.check(file=True) - #assert sometestclass_init_api.read().find( - # '__init__') > -1 - namespace_api = apidir.join('main.html') - assert namespace_api.check(file=True) - html = namespace_api.read() - assert 'SomeTestClass' in html - - sourcedir = tempdir.join('source') - assert sourcedir.check(dir=True) - sometestclass_source = sourcedir.join('sometestclass.py.html') - assert sometestclass_source.check(file=True) - html = sometestclass_source.read() - assert '

sources for sometestclass.py

' in html - - # XXX later... - #index = sourcedir.join('index.html') - #assert index.check(file=True) - #html = index.read() - #assert 'main' in html - Deleted: /py/trunk/py/doc/TODO.txt.merge.tmp ============================================================================== --- /py/trunk/py/doc/TODO.txt.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,561 +0,0 @@ -Things to do before 0.9.0 -========================= - - - -py/bin ------------ - -* review py/bin scripts abit - py.test - py.rest - py.lookup - py.cleanup - py.countloc - -review all py lib documentation -------------------------------------- - -* (hpk, in-progress) rename py/documentation to py/doc - (check web page and pypy usage of it) - -streamline exported API -------------------------------------- - -* (hpk, should be done) move not-to-be-exported Gateway() methods to _ - methods. -* docstrings for all exported API - -* remove: - test.compat.TestCAse - -* check and likely remove already deprecated API - -* remove from public namespace: - XXX consider py.magic. invoke/revoke/patch/revert - -* make "_" namespace: - py.path.extpy -> py.path._extpy - py.log -> py._log (pypy!) - -* review py.io and write py.io.dupfile docstring (XXX guido) - -* re-consider what to do with read and write methods of py.path classes (since - there are places that check for file-ness by doing hasattr(... 'write')) - - (XXX guido talk to holger) - -packaging -------------------------------------- - -* debian and TAR/zip packages for py lib, - particularly look into C module issues (greenlet most importantly) - -* do something about c-extensions both on unix-ish - versus win32 systems - -* ensure compatibility with Python 2.3 - 2.5, - see what is missing for 2.2 - -* optional: support setuptools (eggs?) installs, and instally - from pypi (and register pylib there) - -* see if things work on Win32 (partially done) - -* refine and implement `releasescheme`_ - -.. _releasescheme: releasescheme.html - -APIGEN / source viewer -------------------------------------- - -* make py.test --apigen=PATH_TO_SCRIPT - collect tracing information and call the apigen - script to produce api and source code documentation - - (done) - -* deploy the above "py.test --apigen" run on codespeak - regularly, determine directory locations and URL namespace design. - -* integrate rest directive into py/documentation/conftest.py - with help code from py.__.rest.directive.... - make sure that the txt files in py/documentation/ use it - - (done XXX functions/methods) - -testing ------------ - -* windows tests (rev 36514 passes without errors, many skips) (XXX guido) - -* these should all work on 0.9 and on the py lib and pypy: - - running "py.test -s" - - running "py.test --pdb" - - running "py.test --looponfailing" - - running "py.test" distributed on some hosts - -* consider --box on trunk (XXX guido - find tests that depend on each other) - -* tests should not create any tempdirectories in the source code base - - - (done) - -* try to be as 2.2 compatible as possible - (use e.g. py.builtin.enumerate instead of "enumerate" directly) - - (done) - -distributed testing ----------------------- - - -code quality ------------------ - -* no function implementation longer than 30 lines - -* no lines longer than 80 characters - -* review the pylib issue tracker - (cfbolz: done: what has a 0.8.0 or a 0.9.0 tag should be looked at again) - - -py.test -------- - -* adjust py.test documentation to reflect new - collector/session architecture (mostly done) - -* document py.test's conftest.py approach (somewhat done) - -* py.test fails to parse strangely formatted code after assertion failure - -Missing docstrings ------------------- - -:: - - code.Traceback.recursionindex misses a docstring - code.Traceback.filter misses a docstring - code.Traceback.cut misses a docstring - code.Traceback.__getitem__ misses a docstring - code.Traceback.Entry misses a docstring - code.Traceback.Entry.ishidden misses a docstring - code.Traceback.Entry.getfirstlinesource misses a docstring - code.Traceback.Entry.__str__ misses a docstring - code.Traceback.Entry.__repr__ misses a docstring - code.Traceback.Entry.__init__ misses a docstring - code.Source.getblockend misses a docstring - code.Source.__str__ misses a docstring - code.Source.__len__ misses a docstring - code.Source.__init__ misses a docstring - code.Source.__getslice__ misses a docstring - code.Source.__getitem__ misses a docstring - code.Source.__eq__ misses a docstring - code.Frame.repr misses a docstring - code.Frame.is_true misses a docstring - code.Frame.getargs misses a docstring - code.Frame.exec_ misses a docstring - code.Frame.eval misses a docstring - code.Frame.__init__ misses a docstring - code.ExceptionInfo.exconly misses a docstring - code.ExceptionInfo.errisinstance misses a docstring - code.ExceptionInfo.__str__ misses a docstring - code.ExceptionInfo.__init__ misses a docstring - code.Code misses a docstring - code.Code.source misses a docstring - code.Code.getargs misses a docstring - code.Code.__init__ misses a docstring - code.Code.__eq__ misses a docstring - execnet.SshGateway misses a docstring - execnet.SshGateway.join misses a docstring - execnet.SshGateway.exit misses a docstring - execnet.SshGateway.__repr__ misses a docstring - execnet.SshGateway.__init__ misses a docstring - execnet.SshGateway.ThreadOut.write misses a docstring - execnet.SshGateway.ThreadOut.setwritefunc misses a docstring - execnet.SshGateway.ThreadOut.setdefaultwriter misses a docstring - execnet.SshGateway.ThreadOut.resetdefault misses a docstring - execnet.SshGateway.ThreadOut.isatty misses a docstring - execnet.SshGateway.ThreadOut.flush misses a docstring - execnet.SshGateway.ThreadOut.delwritefunc misses a docstring - execnet.SshGateway.ThreadOut.deinstall misses a docstring - execnet.SocketGateway misses a docstring - execnet.SocketGateway.join misses a docstring - execnet.SocketGateway.exit misses a docstring - execnet.SocketGateway.__repr__ misses a docstring - execnet.SocketGateway.__init__ misses a docstring - execnet.PopenGateway misses a docstring - execnet.PopenGateway.remote_bootstrap_gateway misses a docstring - execnet.PopenGateway.join misses a docstring - execnet.PopenGateway.exit misses a docstring - execnet.PopenGateway.__repr__ misses a docstring - execnet.PopenGateway.__init__ misses a docstring - initpkg misses a docstring - io.dupfile misses a docstring - log.setconsumer misses a docstring - log.get misses a docstring - log.Syslog misses a docstring - log.STDOUT misses a docstring - log.STDERR misses a docstring - log.Producer.set_consumer misses a docstring - log.Producer.get_consumer misses a docstring - log.Producer.__repr__ misses a docstring - log.Producer.__init__ misses a docstring - log.Producer.__getattr__ misses a docstring - log.Producer.__call__ misses a docstring - log.Producer.Message misses a docstring - log.Producer.Message.prefix misses a docstring - log.Producer.Message.content misses a docstring - log.Producer.Message.__str__ misses a docstring - log.Producer.Message.__init__ misses a docstring - log.Path misses a docstring - log.Path.__init__ misses a docstring - log.Path.__call__ misses a docstring - magic.View.__viewkey__ misses a docstring - magic.View.__repr__ misses a docstring - magic.View.__new__ misses a docstring - magic.View.__matchkey__ misses a docstring - magic.View.__getattr__ misses a docstring - magic.AssertionError misses a docstring - path.svnwc.visit misses a docstring - path.svnwc.mkdir misses a docstring - path.svnwc.dump misses a docstring - path.svnwc.check misses a docstring - path.svnwc.add misses a docstring - path.svnwc.__str__ misses a docstring - path.svnwc.__repr__ misses a docstring - path.svnwc.__new__ misses a docstring - path.svnwc.__iter__ misses a docstring - path.svnwc.__hash__ misses a docstring - path.svnwc.__eq__ misses a docstring - path.svnwc.__div__ misses a docstring - path.svnwc.__contains__ misses a docstring - path.svnwc.__cmp__ misses a docstring - path.svnwc.__add__ misses a docstring - path.svnwc.Checkers misses a docstring - path.svnurl.visit misses a docstring - path.svnurl.check misses a docstring - path.svnurl.__repr__ misses a docstring - path.svnurl.__new__ misses a docstring - path.svnurl.__ne__ misses a docstring - path.svnurl.__iter__ misses a docstring - path.svnurl.__hash__ misses a docstring - path.svnurl.__div__ misses a docstring - path.svnurl.__contains__ misses a docstring - path.svnurl.__cmp__ misses a docstring - path.svnurl.__add__ misses a docstring - path.svnurl.Checkers misses a docstring - path.local.visit misses a docstring - path.local.sysexec has an 'XXX' in its docstring - path.local.check misses a docstring - path.local.__repr__ misses a docstring - path.local.__iter__ misses a docstring - path.local.__hash__ misses a docstring - path.local.__eq__ misses a docstring - path.local.__div__ misses a docstring - path.local.__contains__ misses a docstring - path.local.__cmp__ misses a docstring - path.local.__add__ misses a docstring - path.local.Checkers misses a docstring - path.extpy.visit misses a docstring - path.extpy.samefile misses a docstring - path.extpy.relto misses a docstring - path.extpy.listobj misses a docstring - path.extpy.listdir misses a docstring - path.extpy.join misses a docstring - path.extpy.getpymodule misses a docstring - path.extpy.getfilelineno misses a docstring - path.extpy.dirpath misses a docstring - path.extpy.check misses a docstring - path.extpy.__str__ misses a docstring - path.extpy.__repr__ misses a docstring - path.extpy.__new__ misses a docstring - path.extpy.__iter__ misses a docstring - path.extpy.__hash__ misses a docstring - path.extpy.__contains__ misses a docstring - path.extpy.__cmp__ misses a docstring - path.extpy.__add__ misses a docstring - path.extpy.Checkers misses a docstring - test.rest.RestReporter misses a docstring - test.rest.RestReporter.summary misses a docstring - test.rest.RestReporter.skips misses a docstring - test.rest.RestReporter.repr_traceback misses a docstring - test.rest.RestReporter.repr_source misses a docstring - test.rest.RestReporter.repr_signal misses a docstring - test.rest.RestReporter.repr_failure misses a docstring - test.rest.RestReporter.report_unknown misses a docstring - test.rest.RestReporter.report_TestStarted misses a docstring - test.rest.RestReporter.report_TestFinished misses a docstring - test.rest.RestReporter.report_SkippedTryiter misses a docstring - test.rest.RestReporter.report_SendItem misses a docstring - test.rest.RestReporter.report_RsyncFinished misses a docstring - test.rest.RestReporter.report_ReceivedItemOutcome misses a docstring - test.rest.RestReporter.report_Nodes misses a docstring - test.rest.RestReporter.report_ItemStart misses a docstring - test.rest.RestReporter.report_ImmediateFailure misses a docstring - test.rest.RestReporter.report_HostReady misses a docstring - test.rest.RestReporter.report_HostRSyncing misses a docstring - test.rest.RestReporter.report_FailedTryiter misses a docstring - test.rest.RestReporter.report misses a docstring - test.rest.RestReporter.print_summary misses a docstring - test.rest.RestReporter.prepare_source misses a docstring - test.rest.RestReporter.hangs misses a docstring - test.rest.RestReporter.get_rootpath misses a docstring - test.rest.RestReporter.get_path_from_item misses a docstring - test.rest.RestReporter.get_linkwriter misses a docstring - test.rest.RestReporter.get_item_name misses a docstring - test.rest.RestReporter.get_host misses a docstring - test.rest.RestReporter.failures misses a docstring - test.rest.RestReporter.add_rest misses a docstring - test.rest.RestReporter.__init__ misses a docstring - test.rest.RelLinkWriter misses a docstring - test.rest.RelLinkWriter.get_link misses a docstring - test.rest.NoLinkWriter misses a docstring - test.rest.NoLinkWriter.get_link misses a docstring - test.rest.LinkWriter misses a docstring - test.rest.LinkWriter.get_link misses a docstring - test.rest.LinkWriter.__init__ misses a docstring - test.exit misses a docstring - test.deprecated_call misses a docstring - test.collect.Module misses a docstring - test.collect.Module.tryiter has an 'XXX' in its docstring - test.collect.Module.teardown misses a docstring - test.collect.Module.startcapture misses a docstring - test.collect.Module.skipbykeyword misses a docstring - test.collect.Module.setup misses a docstring - test.collect.Module.run misses a docstring - test.collect.Module.makeitem misses a docstring - test.collect.Module.listnames misses a docstring - test.collect.Module.join misses a docstring - test.collect.Module.haskeyword misses a docstring - test.collect.Module.getsortvalue misses a docstring - test.collect.Module.getpathlineno misses a docstring - test.collect.Module.getouterr misses a docstring - test.collect.Module.getitembynames misses a docstring - test.collect.Module.funcnamefilter misses a docstring - test.collect.Module.finishcapture misses a docstring - test.collect.Module.classnamefilter misses a docstring - test.collect.Module.buildname2items misses a docstring - test.collect.Module.__repr__ misses a docstring - test.collect.Module.__ne__ misses a docstring - test.collect.Module.__init__ misses a docstring - test.collect.Module.__hash__ misses a docstring - test.collect.Module.__eq__ misses a docstring - test.collect.Module.__cmp__ misses a docstring - test.collect.Module.Skipped misses a docstring - test.collect.Module.Passed misses a docstring - test.collect.Module.Outcome misses a docstring - test.collect.Module.Failed misses a docstring - test.collect.Module.ExceptionFailure misses a docstring - test.collect.Instance misses a docstring - test.collect.Instance.tryiter has an 'XXX' in its docstring - test.collect.Instance.teardown misses a docstring - test.collect.Instance.startcapture misses a docstring - test.collect.Instance.skipbykeyword misses a docstring - test.collect.Instance.setup misses a docstring - test.collect.Instance.run misses a docstring - test.collect.Instance.makeitem misses a docstring - test.collect.Instance.listnames misses a docstring - test.collect.Instance.join misses a docstring - test.collect.Instance.haskeyword misses a docstring - test.collect.Instance.getsortvalue misses a docstring - test.collect.Instance.getpathlineno misses a docstring - test.collect.Instance.getouterr misses a docstring - test.collect.Instance.getitembynames misses a docstring - test.collect.Instance.funcnamefilter misses a docstring - test.collect.Instance.finishcapture misses a docstring - test.collect.Instance.classnamefilter misses a docstring - test.collect.Instance.buildname2items misses a docstring - test.collect.Instance.__repr__ misses a docstring - test.collect.Instance.__ne__ misses a docstring - test.collect.Instance.__init__ misses a docstring - test.collect.Instance.__hash__ misses a docstring - test.collect.Instance.__eq__ misses a docstring - test.collect.Instance.__cmp__ misses a docstring - test.collect.Generator misses a docstring - test.collect.Generator.tryiter has an 'XXX' in its docstring - test.collect.Generator.teardown misses a docstring - test.collect.Generator.startcapture misses a docstring - test.collect.Generator.skipbykeyword misses a docstring - test.collect.Generator.setup misses a docstring - test.collect.Generator.run misses a docstring - test.collect.Generator.listnames misses a docstring - test.collect.Generator.join misses a docstring - test.collect.Generator.haskeyword misses a docstring - test.collect.Generator.getsortvalue misses a docstring - test.collect.Generator.getpathlineno misses a docstring - test.collect.Generator.getouterr misses a docstring - test.collect.Generator.getitembynames misses a docstring - test.collect.Generator.getcallargs misses a docstring - test.collect.Generator.finishcapture misses a docstring - test.collect.Generator.buildname2items misses a docstring - test.collect.Generator.__repr__ misses a docstring - test.collect.Generator.__ne__ misses a docstring - test.collect.Generator.__init__ misses a docstring - test.collect.Generator.__hash__ misses a docstring - test.collect.Generator.__eq__ misses a docstring - test.collect.Generator.__cmp__ misses a docstring - test.collect.DoctestFile misses a docstring - test.collect.DoctestFile.tryiter has an 'XXX' in its docstring - test.collect.DoctestFile.teardown misses a docstring - test.collect.DoctestFile.startcapture misses a docstring - test.collect.DoctestFile.skipbykeyword misses a docstring - test.collect.DoctestFile.setup misses a docstring - test.collect.DoctestFile.run misses a docstring - test.collect.DoctestFile.makeitem misses a docstring - test.collect.DoctestFile.listnames misses a docstring - test.collect.DoctestFile.join misses a docstring - test.collect.DoctestFile.haskeyword misses a docstring - test.collect.DoctestFile.getsortvalue misses a docstring - test.collect.DoctestFile.getpathlineno misses a docstring - test.collect.DoctestFile.getouterr misses a docstring - test.collect.DoctestFile.getitembynames misses a docstring - test.collect.DoctestFile.funcnamefilter misses a docstring - test.collect.DoctestFile.finishcapture misses a docstring - test.collect.DoctestFile.classnamefilter misses a docstring - test.collect.DoctestFile.buildname2items misses a docstring - test.collect.DoctestFile.__repr__ misses a docstring - test.collect.DoctestFile.__ne__ misses a docstring - test.collect.DoctestFile.__init__ misses a docstring - test.collect.DoctestFile.__hash__ misses a docstring - test.collect.DoctestFile.__eq__ misses a docstring - test.collect.DoctestFile.__cmp__ misses a docstring - test.collect.Directory misses a docstring - test.collect.Directory.tryiter has an 'XXX' in its docstring - test.collect.Directory.teardown misses a docstring - test.collect.Directory.startcapture misses a docstring - test.collect.Directory.skipbykeyword misses a docstring - test.collect.Directory.setup misses a docstring - test.collect.Directory.run misses a docstring - test.collect.Directory.recfilter misses a docstring - test.collect.Directory.makeitem misses a docstring - test.collect.Directory.listnames misses a docstring - test.collect.Directory.join misses a docstring - test.collect.Directory.haskeyword misses a docstring - test.collect.Directory.getsortvalue misses a docstring - test.collect.Directory.getpathlineno misses a docstring - test.collect.Directory.getouterr misses a docstring - test.collect.Directory.getitembynames misses a docstring - test.collect.Directory.finishcapture misses a docstring - test.collect.Directory.filefilter misses a docstring - test.collect.Directory.buildname2items misses a docstring - test.collect.Directory.__repr__ misses a docstring - test.collect.Directory.__ne__ misses a docstring - test.collect.Directory.__init__ misses a docstring - test.collect.Directory.__hash__ misses a docstring - test.collect.Directory.__eq__ misses a docstring - test.collect.Directory.__cmp__ misses a docstring - test.collect.Collector misses a docstring - test.collect.Collector.tryiter has an 'XXX' in its docstring - test.collect.Collector.teardown misses a docstring - test.collect.Collector.startcapture misses a docstring - test.collect.Collector.skipbykeyword misses a docstring - test.collect.Collector.setup misses a docstring - test.collect.Collector.run misses a docstring - test.collect.Collector.listnames misses a docstring - test.collect.Collector.join misses a docstring - test.collect.Collector.haskeyword misses a docstring - test.collect.Collector.getsortvalue misses a docstring - test.collect.Collector.getpathlineno misses a docstring - test.collect.Collector.getouterr misses a docstring - test.collect.Collector.getitembynames misses a docstring - test.collect.Collector.finishcapture misses a docstring - test.collect.Collector.buildname2items misses a docstring - test.collect.Collector.__repr__ misses a docstring - test.collect.Collector.__ne__ misses a docstring - test.collect.Collector.__init__ misses a docstring - test.collect.Collector.__hash__ misses a docstring - test.collect.Collector.__eq__ misses a docstring - test.collect.Collector.__cmp__ misses a docstring - test.collect.Class misses a docstring - test.collect.Class.tryiter has an 'XXX' in its docstring - test.collect.Class.teardown misses a docstring - test.collect.Class.startcapture misses a docstring - test.collect.Class.skipbykeyword misses a docstring - test.collect.Class.setup misses a docstring - test.collect.Class.run misses a docstring - test.collect.Class.makeitem misses a docstring - test.collect.Class.listnames misses a docstring - test.collect.Class.join misses a docstring - test.collect.Class.haskeyword misses a docstring - test.collect.Class.getsortvalue misses a docstring - test.collect.Class.getpathlineno misses a docstring - test.collect.Class.getouterr misses a docstring - test.collect.Class.getitembynames misses a docstring - test.collect.Class.funcnamefilter misses a docstring - test.collect.Class.finishcapture misses a docstring - test.collect.Class.classnamefilter misses a docstring - test.collect.Class.buildname2items misses a docstring - test.collect.Class.__repr__ misses a docstring - test.collect.Class.__ne__ misses a docstring - test.collect.Class.__init__ misses a docstring - test.collect.Class.__hash__ misses a docstring - test.collect.Class.__eq__ misses a docstring - test.collect.Class.__cmp__ misses a docstring - test.cmdline.main misses a docstring - test.Item misses a docstring - test.Item.tryiter has an 'XXX' in its docstring - test.Item.teardown misses a docstring - test.Item.startcapture misses a docstring - test.Item.skipbykeyword misses a docstring - test.Item.setup misses a docstring - test.Item.run misses a docstring - test.Item.listnames misses a docstring - test.Item.join misses a docstring - test.Item.haskeyword misses a docstring - test.Item.getsortvalue misses a docstring - test.Item.getpathlineno misses a docstring - test.Item.getouterr misses a docstring - test.Item.getitembynames misses a docstring - test.Item.finishcapture misses a docstring - test.Item.buildname2items misses a docstring - test.Item.__repr__ misses a docstring - test.Item.__ne__ misses a docstring - test.Item.__init__ misses a docstring - test.Item.__hash__ misses a docstring - test.Item.__eq__ misses a docstring - test.Item.__cmp__ misses a docstring - test.Function.tryiter has an 'XXX' in its docstring - test.Function.teardown misses a docstring - test.Function.startcapture misses a docstring - test.Function.skipbykeyword misses a docstring - test.Function.setup misses a docstring - test.Function.run misses a docstring - test.Function.listnames misses a docstring - test.Function.join misses a docstring - test.Function.haskeyword misses a docstring - test.Function.getsortvalue misses a docstring - test.Function.getpathlineno misses a docstring - test.Function.getouterr misses a docstring - test.Function.getitembynames misses a docstring - test.Function.finishcapture misses a docstring - test.Function.buildname2items misses a docstring - test.Function.__repr__ misses a docstring - test.Function.__ne__ misses a docstring - test.Function.__init__ misses a docstring - test.Function.__hash__ misses a docstring - test.Function.__eq__ misses a docstring - test.Function.__cmp__ misses a docstring - test.Config.__init__ misses a docstring - xml.raw.__init__ misses a docstring - xml.html misses a docstring - xml.html.__tagclass__ misses a docstring - xml.html.__tagclass__.unicode misses a docstring - xml.html.__tagclass__.__unicode__ misses a docstring - xml.html.__tagclass__.__repr__ misses a docstring - xml.html.__tagclass__.__init__ misses a docstring - xml.html.__tagclass__.Attr misses a docstring - xml.html.__tagclass__.Attr.__init__ misses a docstring - xml.html.__metaclass__ misses a docstring - xml.html.__metaclass__.__getattr__ misses a docstring - xml.html.Style misses a docstring - xml.html.Style.__init__ misses a docstring - xml.escape misses a docstring - xml.Tag misses a docstring - xml.Tag.unicode misses a docstring - xml.Tag.__unicode__ misses a docstring - xml.Tag.__repr__ misses a docstring - xml.Tag.__init__ misses a docstring - xml.Namespace misses a docstring Deleted: /py/trunk/py/doc/test_conftest.py.merge.tmp ============================================================================== --- /py/trunk/py/doc/test_conftest.py.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,73 +0,0 @@ - -import py - -def setup_module(mod): - mod.tmpdir = py.test.ensuretemp('docdoctest') - -def test_doctest_basic(): - # XXX get rid of the next line: - py.magic.autopath().dirpath('conftest.py').copy(tmpdir.join('conftest.py')) - - xtxt = tmpdir.join('x.txt') - xtxt.write(py.code.Source(""" - .. - >>> from os.path import abspath - - hello world - - >>> assert abspath - >>> i=3 - >>> print i - 3 - - yes yes - - >>> i - 3 - - end - """)) - config = py.test.config._reparse([xtxt]) - session = config.initsession() - session.main() - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 0 - l = session.getitemoutcomepairs(py.test.Item.Passed) - l2 = session.getitemoutcomepairs(py.test.Item.Skipped) - assert len(l+l2) == 2 - -def test_js_ignore(): - py.magic.autopath().dirpath('conftest.py').copy(tmpdir.join('conftest.py')) - tmpdir.ensure('__init__.py') - xtxt = tmpdir.join('x.txt') - xtxt.write(py.code.Source(""" - `blah`_ - - .. _`blah`: javascript:some_function() - """)) - config = py.test.config._reparse([xtxt]) - session = config.initsession() - session.main() - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 0 - l = session.getitemoutcomepairs(py.test.Item.Passed) - l2 = session.getitemoutcomepairs(py.test.Item.Skipped) - assert len(l+l2) == 3 - -def test_resolve_linkrole(): - from py.__.doc.conftest import resolve_linkrole - assert resolve_linkrole('api', 'py.foo.bar') == ( - 'py.foo.bar', '../../apigen/api/foo.bar.html') - assert resolve_linkrole('api', 'py.foo.bar()') == ( - 'py.foo.bar()', '../../apigen/api/foo.bar.html') - assert resolve_linkrole('api', 'py') == ( - 'py', '../../apigen/api/index.html') - py.test.raises(AssertionError, 'resolve_linkrole("api", "foo.bar")') - assert resolve_linkrole('source', 'py/foo/bar.py') == ( - 'py/foo/bar.py', '../../apigen/source/foo/bar.py.html') - assert resolve_linkrole('source', 'py/foo/') == ( - 'py/foo/', '../../apigen/source/foo/index.html') - assert resolve_linkrole('source', 'py/') == ( - 'py/', '../../apigen/source/index.html') - py.test.raises(AssertionError, 'resolve_linkrole("source", "/foo/bar/")') - Deleted: /py/trunk/py/test/config.py.merge.tmp ============================================================================== --- /py/trunk/py/test/config.py.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,288 +0,0 @@ -from __future__ import generators - -import py -from conftesthandle import Conftest - -optparse = py.compat.optparse - -# XXX move to Config class -basetemp = None -def ensuretemp(string, dir=1): - """ return temporary directory path with - the given string as the trailing part. - """ - global basetemp - if basetemp is None: - basetemp = py.path.local.make_numbered_dir(prefix='pytest-') - return basetemp.ensure(string, dir=dir) - -class CmdOptions(object): - """ pure container instance for holding cmdline options - as attributes. - """ - def __repr__(self): - return "" %(self.__dict__,) - -class Config(object): - """ central hub for dealing with configuration/initialization data. """ - Option = optparse.Option - - def __init__(self): - self.option = CmdOptions() - self._parser = optparse.OptionParser( - usage="usage: %prog [options] [query] [filenames of tests]") - self.conftest = Conftest() - self._initialized = False - self._overwrite_dict = {} - - def parse(self, args): - """ parse cmdline arguments into this config object. - Note that this can only be called once per testing process. - """ - assert not self._initialized, ( - "can only parse cmdline args once per Config object") - self._initialized = True - self.conftest.setinitial(args) - self.conftest.rget('adddefaultoptions')() - args = [str(x) for x in args] - cmdlineoption, args = self._parser.parse_args(args) - self.option.__dict__.update(vars(cmdlineoption)) - fixoptions(self.option) # XXX fixing should be moved to sessions - if not args: - args.append(py.std.os.getcwd()) - self.topdir = gettopdir(args) - self.args = args - - def initdirect(self, topdir, repr, coltrails=None): - assert not self._initialized - self._initialized = True - self.topdir = py.path.local(topdir) - self.merge_repr(repr) - self._coltrails = coltrails - - def getcolitems(self): - """ return initial collectors. """ - trails = getattr(self, '_coltrails', None) - return [self._getcollector(path) for path in (trails or self.args)] - - def _getcollector(self, path): - if isinstance(path, tuple): - relpath, names = path - fspath = self.topdir.join(relpath) - col = self._getcollector(fspath) - else: - path = py.path.local(path) - assert path.check(), "%s: path does not exist" %(path,) - col = self._getrootcollector(path) - names = path.relto(col.fspath).split(path.sep) - return col.getitembynames(names) - - def _getrootcollector(self, path): - pkgpath = path.pypkgpath() - if pkgpath is None: - pkgpath = path.check(file=1) and path.dirpath() or path - col = self.conftest.rget("Directory", pkgpath)(pkgpath) - col.config = self - return col - - def addoptions(self, groupname, *specs): - """ add a named group of options to the current testing session. - This function gets invoked during testing session initialization. - """ - optgroup = optparse.OptionGroup(self._parser, groupname) - optgroup.add_options(specs) - self._parser.add_option_group(optgroup) - for opt in specs: - if hasattr(opt, 'default') and opt.dest: - setattr(self.option, opt.dest, opt.default) - return self.option - - def getvalue(self, name, path=None): - """ return 'name' value looked up from the first conftest file - found up the path (including the path itself). - if path is None, lookup the value in the initial - conftest modules found during command line parsing. - """ - try: - return self._overwrite_dict[name] - except KeyError: - return self.conftest.rget(name, path) - - def initsession(self): - """ return an initialized session object. """ - cls = self._getsessionclass() - session = cls(self) - #session.fixoptions() - return session - - def _getsessionclass(self): - """ return Session class determined from cmdline options - and looked up in initial config modules. - """ - if self.option.session is not None: - return self.conftest.rget(self.option.session) - else: - name = self._getsessionname() - importpath = globals()[name] - mod = __import__(importpath, None, None, '__doc__') - return getattr(mod, name) - - def _getsessionname(self): - """ return default session name as determined from options. """ - name = 'TerminalSession' - if self.option.dist: - name = 'RSession' - elif self.option.tkinter: - name = 'TkinterSession' - else: - optnames = 'startserver runbrowser apigen restreport boxing'.split() - for opt in optnames: - if getattr(self.option, opt, False): - name = 'LSession' - break - else: - if self.getvalue('dist_boxing'): - name = 'LSession' - if self.option.looponfailing: - name = 'RemoteTerminalSession' - elif self.option.executable: - name = 'RemoteTerminalSession' - return name - - def is_boxed(self): - # XXX probably not a good idea to have this special function ... - return self.option.boxing or self.getvalue("dist_boxing") - - def _reparse(self, args): - """ this is used from tests that want to re-invoke parse(). """ - global config_per_process - oldconfig = py.test.config - try: - config_per_process = py.test.config = Config() - config_per_process.parse(args) - return config_per_process - finally: - config_per_process = py.test.config = oldconfig - - def _overwrite(self, name, value): - """ this is used from tests to overwrite values irrespectives of conftests. - """ - self._overwrite_dict[name] = value - - def make_repr(self, conftestnames, optnames=None): - """ return a marshallable representation - of conftest and cmdline options. - if optnames is None, all options - on self.option will be transferred. - """ - conftestdict = {} - for name in conftestnames: - value = self.getvalue(name) - checkmarshal(name, value) - conftestdict[name] = value - cmdlineopts = {} - if optnames is None: - optnames = dir(self.option) - for name in optnames: - if not name.startswith("_"): - value = getattr(self.option, name) - checkmarshal(name, value) - cmdlineopts[name] = value - l = [] - for path in self.args: - path = py.path.local(path) - l.append(path.relto(self.topdir)) - return l, conftestdict, cmdlineopts - - def merge_repr(self, repr): - """ merge in the conftest and cmdline option values - found in the given representation (produced - by make_repr above). - - The repr-contained conftest values are - stored on the default conftest module (last - priority) and the cmdline options on self.option. - """ - class override: - def __init__(self, d): - self.__dict__.update(d) - args, conftestdict, cmdlineopts = repr - self.args = [self.topdir.join(x) for x in args] - self.conftest.setinitial(self.args) - self.conftest._path2confmods[None].append(override(conftestdict)) - for name, val in cmdlineopts.items(): - setattr(self.option, name, val) - - def get_collector_trail(self, collector): - """ provide a trail relative to the topdir, - which can be used to reconstruct the - collector (possibly on a different host - starting from a different topdir). - """ - chain = collector.listchain() - relpath = chain[0].fspath.relto(self.topdir) - if not relpath: - if chain[0].fspath == self.topdir: - relpath = "." - else: - raise ValueError("%r not relative to %s" - %(chain[0], self.topdir)) - return relpath, tuple([x.name for x in chain[1:]]) - -# this is the one per-process instance of py.test configuration -config_per_process = Config() - -# default import paths for sessions - -TkinterSession = 'py.__.test.tkinter.reportsession' -TerminalSession = 'py.__.test.terminal.terminal' -TerminalSession = 'py.__.test.terminal.terminal' -RemoteTerminalSession = 'py.__.test.terminal.remote' -RSession = 'py.__.test.rsession.rsession' -LSession = 'py.__.test.rsession.rsession' - -# -# helpers -# - -def checkmarshal(name, value): - try: - py.std.marshal.dumps(value) - except ValueError: - raise ValueError("%s=%r is not marshallable" %(name, value)) - -def fixoptions(option): - """ sanity checks and making option values canonical. """ - - # implied options - if option.usepdb: - if not option.nocapture: - #print "--pdb implies --nocapture" - option.nocapture = True - - if option.runbrowser and not option.startserver: - #print "--runbrowser implies --startserver" - option.startserver = True - - # conflicting options - if option.looponfailing and option.usepdb: - raise ValueError, "--looponfailing together with --pdb not supported." - if option.looponfailing and option.dist: - raise ValueError, "--looponfailing together with --dist not supported." - if option.executable and option.usepdb: - raise ValueError, "--exec together with --pdb not supported." - - -def gettopdir(args): - """ return the top directory for the given paths. - if the common base dir resides in a python package - parent directory of the root package is returned. - """ - args = [py.path.local(arg) for arg in args] - p = reduce(py.path.local.common, args) - assert p, "cannot determine common basedir of %s" %(args,) - pkgdir = p.pypkgpath() - if pkgdir is None: - return p - else: - return pkgdir.dirpath() Deleted: /py/trunk/py/test/rsession/conftest.py ============================================================================== --- /py/trunk/py/test/rsession/conftest.py Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,10 +0,0 @@ -import py -Option = py.test.config.Option - -option = py.test.config.addoptions("boxing test options", - Option('', '--skip-kill-test', action='store_true', default=False, - dest='skip_kill_test', - help='skip a certain test that checks for os.kill results, this ' - 'should be used when kill() is not allowed for the current ' - 'user'), -) Deleted: /py/trunk/py/test/rsession/rest.py.merge.tmp ============================================================================== --- /py/trunk/py/test/rsession/rest.py.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,276 +0,0 @@ - -""" Rest reporting stuff -""" - -import py -import sys -from StringIO import StringIO -from py.__.test.rsession.reporter import AbstractReporter -from py.__.test.rsession import report -from py.__.rest.rst import * - -class RestReporter(AbstractReporter): - linkwriter = None - - def __init__(self, *args, **kwargs): - super(RestReporter, self).__init__(*args, **kwargs) - self.rest = Rest() - self.traceback_num = 0 - - def get_linkwriter(self): - if self.linkwriter is None: - try: - self.linkwriter = self.config.getvalue('linkwriter') - except KeyError: - print >>sys.stderr, ('no linkwriter configured, using default ' - 'one') - self.linkwriter = RelLinkWriter() - return self.linkwriter - - def report_unknown(self, what): - if self.config.option.verbose: - self.add_rest(Paragraph("Unknown report: %s" % what)) - - def gethost(self, item): - if item.channel: - return item.channel.gateway.host - return self.hosts[0] - - def report_SendItem(self, item): - address = self.gethost(item) - if self.config.option.verbose: - self.add_rest(Paragraph('sending item %s to %s' % (item.item, - address))) - - def report_HostRSyncing(self, item): - self.add_rest(LiteralBlock('%10s: RSYNC ==> %s' % (item.host.hostname[:10], - item.remoterootpath))) - - def report_HostReady(self, item): - self.add_rest(LiteralBlock('%10s: READY' % (item.host.hostname[:10],))) - - def report_TestStarted(self, event): - txt = "Running tests on hosts: %s" % ", ".join(event.hosts) - self.add_rest(Title(txt, abovechar='=', belowchar='=')) - self.timestart = event.timestart - - def report_TestFinished(self, item): - self.timeend = item.timeend - self.summary() - return len(self.failed_tests_outcome) > 0 - - def report_ImmediateFailure(self, item): - pass - - def report_ItemStart(self, event): - item = event.item - if isinstance(item, py.test.collect.Module): - lgt = len(list(item.tryiter())) - lns = item.listnames()[1:] - name = "/".join(lns) - link = self.get_linkwriter().get_link(self.get_rootpath(item), - item.fspath) - if link: - name = Link(name, link) - txt = 'Testing module %s (%d items)' % (name, lgt) - self.add_rest(Title('Testing module', name, '(%d items)' % (lgt,), - belowchar='-')) - - def get_rootpath(self, item): - root = item.parent - while root.parent is not None: - root = root.parent - return root.fspath - - def print_summary(self, total, skipped_str, failed_str): - self.skips() - self.failures() - - txt = "%d tests run%s%s in %.2fs (rsync: %.2f)" % \ - (total, skipped_str, failed_str, self.timeend - self.timestart, - self.timersync - self.timestart) - self.add_rest(Title(txt, belowchar='-')) - - # since we're rendering each item, the links haven't been rendered - # yet - self.out.write(self.rest.render_links()) - - def report_ReceivedItemOutcome(self, event): - host = self.gethost(event) - if event.outcome.passed: - status = [Strong("PASSED")] - self.passed[host] += 1 - elif event.outcome.skipped: - status = [Strong("SKIPPED")] - self.skipped_tests_outcome.append(event) - self.skipped[host] += 1 - else: - status = [Strong("FAILED"), - InternalLink("traceback%d" % self.traceback_num)] - self.traceback_num += 1 - self.failed[host] += 1 - self.failed_tests_outcome.append(event) - # we'll take care of them later - itempath = self.get_path_from_item(event.item) - status.append(Text(itempath)) - hostname = host.hostname - self.add_rest(ListItem(Text("%10s:" % (hostname[:10],)), *status)) - - def skips(self): - # XXX hrmph, copied code - texts = {} - for event in self.skipped_tests_outcome: - colitem = event.item - if isinstance(event, report.ReceivedItemOutcome): - outcome = event.outcome - text = outcome.skipped - itemname = self.get_item_name(event, colitem) - elif isinstance(event, report.SkippedTryiter): - text = str(event.excinfo.value) - itemname = "/".join(colitem.listnames()) - if text not in texts: - texts[text] = [itemname] - else: - texts[text].append(itemname) - if texts: - self.add_rest(Title('Reasons for skipped tests:', belowchar='+')) - for text, items in texts.items(): - for item in items: - self.add_rest(ListItem('%s: %s' % (item, text))) - - def get_host(self, event): - return event.channel.gateway.host - - def failures(self): - self.traceback_num = 0 - tbstyle = self.config.option.tbstyle - if self.failed_tests_outcome: - self.add_rest(Title('Exceptions:', belowchar='+')) - for i, event in enumerate(self.failed_tests_outcome): - if i > 0: - self.add_rest(Transition()) - if isinstance(event, report.ReceivedItemOutcome): - host = self.get_host(event) - itempath = self.get_path_from_item(event.item) - root = self.get_rootpath(event.item) - link = self.get_linkwriter().get_link(root, event.item.fspath) - t = Title(belowchar='+') - if link: - t.add(Link(itempath, link)) - else: - t.add(Text(itempath)) - t.add(Text('on %s' % (host.hostname,))) - self.add_rest(t) - if event.outcome.signal: - self.repr_signal(event.item, event.outcome) - else: - self.repr_failure(event.item, event.outcome, tbstyle) - else: - itempath = self.get_path_from_item(event.item) - root = self.get_rootpath(event.item) - link = self.get_linkwriter().get_link(root, event.item.fspath) - t = Title(abovechar='+', belowchar='+') - if link: - t.add(Link(itempath, link)) - else: - t.add(Text(itempath)) - out = outcome.Outcome(excinfo=event.excinfo) - self.repr_failure(event.item, - outcome.ReprOutcome(out.make_repr()), - tbstyle) - - def repr_signal(self, item, outcome): - signal = outcome.signal - self.add_rest(Title('Received signal: %d' % (outcome.signal,), - abovechar='+', belowchar='+')) - if outcome.stdout.strip(): - self.add_rest(Paragraph('Captured process stdout:')) - self.add_rest(LiteralBlock(outcome.stdout)) - if outcome.stderr.strip(): - self.add_rest(Paragraph('Captured process stderr:')) - self.add_rest(LiteralBlock(outcome.stderr)) - - def repr_failure(self, item, outcome, style): - excinfo = outcome.excinfo - traceback = excinfo.traceback - if not traceback: - self.add_rest(Paragraph('empty traceback from item %r' % (item,))) - return - self.repr_traceback(item, excinfo, traceback, style) - if outcome.stdout: - self.add_rest(Title('Captured process stdout:', abovechar='+', - belowchar='+')) - self.add_rest(LiteralBlock(outcome.stdout)) - if outcome.stderr: - self.add_rest(Title('Captured process stderr:', abovechar='+', - belowchar='+')) - self.add_rest(LiteralBlock(outcome.stderr)) - - def repr_traceback(self, item, excinfo, traceback, style): - root = self.get_rootpath(item) - self.add_rest(LinkTarget('traceback%d' % self.traceback_num, "")) - self.traceback_num += 1 - if style == 'long': - for entry in traceback: - link = self.get_linkwriter().get_link(root, - py.path.local(entry.path)) - if link: - self.add_rest(Title(Link(entry.path, link), - 'line %d' % (entry.lineno,), - belowchar='+', abovechar='+')) - else: - self.add_rest(Title('%s line %d' % (entry.path, - entry.lineno,), - belowchar='+', abovechar='+')) - self.add_rest(LiteralBlock(self.prepare_source(entry.relline, - entry.source))) - elif style == 'short': - text = [] - for entry in traceback: - text.append('%s line %d' % (entry.path, entry.lineno)) - text.append(' %s' % (entry.source.strip(),)) - self.add_rest(LiteralBlock('\n'.join(text))) - self.add_rest(Title(excinfo.typename, belowchar='+')) - self.add_rest(LiteralBlock(excinfo.value)) - - def prepare_source(self, relline, source): - text = [] - for num, line in enumerate(source.split('\n')): - if num == relline: - text.append('>>> %s' % (line,)) - else: - text.append(' %s' % (line,)) - return '\n'.join(text) - - def add_rest(self, item): - self.rest.add(item) - self.out.write('%s\n\n' % (item.text(),)) - - def get_path_from_item(self, item): - lns = item.listnames()[1:] - for i, ln in enumerate(lns): - if i > 0 and ln != '()': - lns[i] = '/%s' % (ln,) - itempath = ''.join(lns) - return itempath - -class AbstractLinkWriter(object): - def get_link(self, base, path): - pass - -class NoLinkWriter(AbstractLinkWriter): - def get_link(self, base, path): - return '' - -class LinkWriter(AbstractLinkWriter): - def __init__(self, baseurl): - self.baseurl = baseurl - - def get_link(self, base, path): - relpath = path.relto(base) - return self.baseurl + relpath - -class RelLinkWriter(AbstractLinkWriter): - def get_link(self, base, path): - return path.relto(base) - Deleted: /py/trunk/py/test/rsession/rsession.py.merge.tmp ============================================================================== --- /py/trunk/py/test/rsession/rsession.py.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,297 +0,0 @@ - -""" Remote session base class -""" - -import os -import py -import sys -import re -import time - -from py.__.test.rsession import report -from py.__.test.rsession.master import \ - setup_slave, MasterNode, dispatch_loop, itemgen, randomgen -from py.__.test.rsession.hostmanage import HostInfo, HostOptions, HostManager - -from py.__.test.rsession.local import local_loop, plain_runner, apigen_runner,\ - box_runner -from py.__.test.rsession.reporter import LocalReporter, RemoteReporter - -class AbstractSession(object): - """ - An abstract session executes collectors/items through a runner. - - """ - def __init__(self, config, optimise_localhost=True): - self.config = config - self.optimise_localhost = optimise_localhost - - def make_colitems(paths, baseon): - # we presume that from the base we can simply get to - # the target paths by joining the basenames - res = [] - for x in paths: - x = py.path.local(x) - current = py.test.collect.Directory(baseon) - relparts = x.relto(baseon).split(x.sep) - assert relparts - for part in relparts: - next = current.join(part) - assert next is not None, (current, part) - current = next - res.append(current) - return res - make_colitems = staticmethod(make_colitems) - - def getpkgdir(path): - path = py.path.local(path) - pkgpath = path.pypkgpath() - if pkgpath is None: - pkgpath = path - return pkgpath - getpkgdir = staticmethod(getpkgdir) - - def init_reporter(self, reporter, sshhosts, reporter_class, arg=""): - """ This initialises so called `reporter` class, which will - handle all event presenting to user. Does not get called - if main received custom reporter - """ - startserverflag = self.config.option.startserver - restflag = self.config.option.restreport - - if startserverflag and reporter is None: - from py.__.test.rsession.web import start_server, exported_methods - if self.config.option.runbrowser: - from socket import INADDR_ANY - port = INADDR_ANY # pick a random port when starting browser - else: - port = 8000 # stick to a fixed port otherwise - - reporter = exported_methods.report - httpd = start_server(server_address = ('', port)) - port = httpd.server_port - if self.config.option.runbrowser: - import webbrowser, thread - # webbrowser.open() may block until the browser finishes or not - url = "http://localhost:%d" % (port,) - thread.start_new_thread(webbrowser.open, (url,)) - elif reporter is None: - if restflag: - from py.__.test.rsession.rest import RestReporter - reporter_class = RestReporter - if arg: - reporter_instance = reporter_class(self.config, sshhosts, self.getpkgdir(arg)) - else: - reporter_instance = reporter_class(self.config, sshhosts) - reporter = reporter_instance.report - else: - startserverflag = False - - return reporter, startserverflag - - def reporterror(reporter, data): - excinfo, item = data - if excinfo is None: - reporter(report.ItemStart(item)) - elif excinfo.type is py.test.Item.Skipped: - reporter(report.SkippedTryiter(excinfo, item)) - else: - reporter(report.FailedTryiter(excinfo, item)) - reporterror = staticmethod(reporterror) - - def kill_server(self, startserverflag): - """ Kill web server - """ - if startserverflag: - from py.__.test.rsession.web import kill_server - kill_server() - - def wrap_reporter(self, reporter): - """ We wrap reporter around, which makes it possible to us to track - number of failures - """ - self.was_failure = False - def new_reporter(event): - if isinstance(event, report.ReceivedItemOutcome) and \ - not event.outcome.passed and \ - not event.outcome.skipped: - self.was_failure = True - return reporter(event) - checkfun = lambda : self.config.option.exitfirst and \ - self.was_failure - # for tests - self.checkfun = checkfun - return new_reporter, checkfun - -def parse_directories(sshhosts): - """ Parse sshadresses of hosts to have distinct hostname/hostdir - """ - directories = {} - for host in sshhosts: - m = re.match("^(.*?):(.*)$", host.hostname) - if m: - host.hostname = m.group(1) - host.relpath = m.group(2) + "-" + host.hostname - else: - host.relpath = "pytestcache-%s" % host.hostname - -class RSession(AbstractSession): - """ Remote version of session - """ - def main(self, reporter=None): - """ main loop for running tests. """ - args = self.config.args - - sshhosts, remotepython, rsync_roots = self.read_distributed_config() - reporter, startserverflag = self.init_reporter(reporter, - sshhosts, RemoteReporter) - reporter, checkfun = self.wrap_reporter(reporter) - - reporter(report.TestStarted(sshhosts)) - - pkgdir = self.getpkgdir(args[0]) - done_dict = {} - hostopts = HostOptions(rsync_roots=rsync_roots, - remote_python=remotepython, - optimise_localhost=self.optimise_localhost) - hostmanager = HostManager(sshhosts, self.config, pkgdir, hostopts) - try: - nodes = hostmanager.init_hosts(reporter, done_dict) - reporter(report.RsyncFinished()) - try: - self.dispatch_tests(nodes, args, pkgdir, reporter, checkfun, done_dict) - except (KeyboardInterrupt, SystemExit): - print >>sys.stderr, "C-c pressed waiting for gateways to teardown..." - channels = [node.channel for node in nodes] - hostmanager.kill_channels(channels) - hostmanager.teardown_gateways(reporter, channels) - print >>sys.stderr, "... Done" - raise - - channels = [node.channel for node in nodes] - hostmanager.teardown_hosts(reporter, channels, nodes, - exitfirst=self.config.option.exitfirst) - reporter(report.Nodes(nodes)) - retval = reporter(report.TestFinished()) - self.kill_server(startserverflag) - return retval - except (KeyboardInterrupt, SystemExit): - reporter(report.InterruptedExecution()) - self.kill_server(startserverflag) - raise - except: - reporter(report.CrashedExecution()) - self.kill_server(startserverflag) - raise - - def read_distributed_config(self): - """ Read from conftest file the configuration of distributed testing - """ - try: - rsync_roots = self.config.getvalue("distrsync_roots") - except: - rsync_roots = None # all files and directories in the pkgdir - sshhosts = [HostInfo(i) for i in - self.config.getvalue("disthosts")] - parse_directories(sshhosts) - remotepython = self.config.getvalue("dist_remotepython") - return sshhosts, remotepython, rsync_roots - - def dispatch_tests(self, nodes, args, pkgdir, reporter, checkfun, done_dict): - colitems = self.make_colitems(args, baseon=pkgdir.dirpath()) - keyword = self.config.option.keyword - itemgenerator = itemgen(colitems, reporter, keyword, self.reporterror) - - all_tests = dispatch_loop(nodes, itemgenerator, checkfun) - #if all_tests: - # todo = {} - # for key, value in all_tests.items(): - # if key not in done_dict: - # todo[key] = True - # rg = randomgen(todo, done_dict) - # dispatch_loop(nodes, rg, lambda:False, max_tasks_per_node=1) - - -class LSession(AbstractSession): - """ Local version of session - """ - def main(self, reporter=None, runner=None): - # check out if used options makes any sense - args = self.config.args - - sshhosts = [HostInfo('localhost')] # this is just an info to reporter - - if not self.config.option.nomagic: - py.magic.invoke(assertion=1) - - reporter, startserverflag = self.init_reporter(reporter, - sshhosts, LocalReporter, args[0]) - reporter, checkfun = self.wrap_reporter(reporter) - - reporter(report.TestStarted(sshhosts)) - pkgdir = self.getpkgdir(args[0]) - colitems = self.make_colitems(args, baseon=pkgdir.dirpath()) - reporter(report.RsyncFinished()) - - if runner is None: - runner = self.init_runner(pkgdir) - - keyword = self.config.option.keyword - - itemgenerator = itemgen(colitems, reporter, keyword, self.reporterror) - local_loop(self, reporter, itemgenerator, checkfun, self.config, runner=runner) - - retval = reporter(report.TestFinished()) - self.kill_server(startserverflag) - - if not self.config.option.nomagic: - py.magic.revoke(assertion=1) - - self.write_docs(pkgdir) - return retval - - def write_docs(self, pkgdir): - if self.config.option.apigen: - from py.__.apigen.tracer.docstorage import DocStorageAccessor - apigen = py.path.local(self.config.option.apigen).pyimport() - print >>sys.stderr, 'building documentation' - capture = py.io.OutErrCapture() - try: - try: - apigen.build(pkgdir, DocStorageAccessor(self.docstorage)) - except (ValueError, AttributeError): - #import traceback - #exc, e, tb = sys.exc_info() - #print '%s - %s' % (exc, e) - #print ''.join(traceback.format_tb(tb)) - #del tb - #print '-' * 79 - raise NotImplementedError("Provided script does not seem " - "to contain build function") - finally: - capture.reset() - - def init_runner(self, pkgdir): - if self.config.option.apigen: - from py.__.apigen.tracer.tracer import Tracer, DocStorage - module = py - try: - apigen = py.path.local(self.config.option.apigen).pyimport() - items = apigen.get_documentable_items(pkgdir) - if isinstance(items, dict): - self.docstorage = DocStorage().from_dict(items) - else: - self.docstorage = DocStorage().from_pkg(items) - except ImportError: - raise ImportError("Provided script cannot be imported") - except (ValueError, AttributeError): - raise NotImplementedError("Provided script does not seem " - "to contain get_documentable_items") - self.tracer = Tracer(self.docstorage) - return apigen_runner - else: - if (self.config.getvalue('dist_boxing') or self.config.option.boxing)\ - and not self.config.option.nocapture: - return box_runner - return plain_runner - Deleted: /py/trunk/py/test/rsession/rsync.py ============================================================================== --- /py/trunk/py/test/rsession/rsync.py Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,137 +0,0 @@ -import py, os, stat, md5 -from Queue import Queue - - -class RSync(object): - - def __init__(self, callback=None, **options): - for name in options: - assert name in ('delete') - self.options = options - self.callback = callback - self.channels = {} - self.receivequeue = Queue() - self.links = [] - - def filter(self, path): - return True - - def add_target(self, gateway, destdir, finishedcallback=None): - def itemcallback(req): - self.receivequeue.put((channel, req)) - channel = gateway.remote_exec(REMOTE_SOURCE) - channel.setcallback(itemcallback, endmarker = None) - channel.send((str(destdir), self.options)) - self.channels[channel] = finishedcallback - - def send(self, sourcedir): - self.sourcedir = str(sourcedir) - # normalize a trailing '/' away - self.sourcedir = os.path.dirname(os.path.join(self.sourcedir, 'x')) - # send directory structure and file timestamps/sizes - self._send_directory_structure(self.sourcedir) - - # paths and to_send are only used for doing - # progress-related callbacks - self.paths = {} - self.to_send = {} - - # send modified file to clients - while self.channels: - channel, req = self.receivequeue.get() - if req is None: - # end-of-channel - if channel in self.channels: - # too early! we must have got an error - channel.waitclose() - # or else we raise one - raise IOError('connection unexpectedly closed: %s ' % ( - channel.gateway,)) - else: - command, data = req - if command == "links": - for link in self.links: - channel.send(link) - # completion marker, this host is done - channel.send(42) - elif command == "done": - finishedcallback = self.channels.pop(channel) - if finishedcallback: - finishedcallback() - elif command == "ack": - if self.callback: - self.callback("ack", self.paths[data], channel) - elif command == "list_done": - # sum up all to send - if self.callback: - s = sum([self.paths[i] for i in self.to_send[channel]]) - self.callback("list", s, channel) - elif command == "send": - modified_rel_path, checksum = data - modifiedpath = os.path.join(self.sourcedir, *modified_rel_path) - f = open(modifiedpath, 'rb') - data = f.read() - - # provide info to progress callback function - modified_rel_path = "/".join(modified_rel_path) - self.paths[modified_rel_path] = len(data) - if channel not in self.to_send: - self.to_send[channel] = [] - self.to_send[channel].append(modified_rel_path) - - f.close() - if checksum is not None and checksum == md5.md5(data).digest(): - data = None # not really modified - else: - # ! there is a reason for the interning: - # sharing multiple copies of the file's data - data = intern(data) - print '%s <= %s' % ( - channel.gateway._getremoteaddress(), - modified_rel_path) - channel.send(data) - del data - else: - assert "Unknown command %s" % command - - def _broadcast(self, msg): - for channel in self.channels: - channel.send(msg) - - def _send_link(self, basename, linkpoint): - self.links.append(("link", basename, linkpoint)) - - def _send_directory_structure(self, path): - st = os.lstat(path) - if stat.S_ISREG(st.st_mode): - # regular file: send a timestamp/size pair - self._broadcast((st.st_mtime, st.st_size)) - elif stat.S_ISDIR(st.st_mode): - # dir: send a list of entries - names = [] - subpaths = [] - for name in os.listdir(path): - p = os.path.join(path, name) - if self.filter(p): - names.append(name) - subpaths.append(p) - self._broadcast(names) - for p in subpaths: - self._send_directory_structure(p) - elif stat.S_ISLNK(st.st_mode): - linkpoint = os.readlink(path) - basename = path[len(self.sourcedir) + 1:] - if not linkpoint.startswith(os.sep): - # relative link, just send it - self._send_link(basename, linkpoint) - elif linkpoint.startswith(self.sourcedir): - self._send_link(basename, linkpoint[len(self.sourcedir) + 1:]) - else: - self._send_link(basename, linkpoint) - self._broadcast(None) - else: - raise ValueError, "cannot sync %r" % (path,) - -REMOTE_SOURCE = py.path.local(__file__).dirpath().\ - join('rsync_remote.py').open().read() + "\nf()" - Deleted: /py/trunk/py/test/rsession/rsync_remote.py ============================================================================== --- /py/trunk/py/test/rsession/rsync_remote.py Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,86 +0,0 @@ - -def f(): - import os, stat, shutil, md5 - destdir, options = channel.receive() - modifiedfiles = [] - - def remove(path): - assert path.startswith(destdir) - try: - os.unlink(path) - except OSError: - # assume it's a dir - shutil.rmtree(path) - - def receive_directory_structure(path, relcomponents): - try: - st = os.lstat(path) - except OSError: - st = None - msg = channel.receive() - if isinstance(msg, list): - if st and not stat.S_ISDIR(st.st_mode): - os.unlink(path) - st = None - if not st: - os.makedirs(path) - entrynames = {} - for entryname in msg: - receive_directory_structure(os.path.join(path, entryname), - relcomponents + [entryname]) - entrynames[entryname] = True - if options.get('delete'): - for othername in os.listdir(path): - if othername not in entrynames: - otherpath = os.path.join(path, othername) - remove(otherpath) - elif msg is not None: - checksum = None - if st: - if stat.S_ISREG(st.st_mode): - msg_mtime, msg_size = msg - if msg_size != st.st_size: - pass - elif msg_mtime != st.st_mtime: - f = open(path, 'rb') - checksum = md5.md5(f.read()).digest() - f.close() - else: - return # already fine - else: - remove(path) - channel.send(("send", (relcomponents, checksum))) - modifiedfiles.append((path, msg)) - receive_directory_structure(destdir, []) - - STRICT_CHECK = False # seems most useful this way for py.test - channel.send(("list_done", None)) - - for path, (time, size) in modifiedfiles: - data = channel.receive() - channel.send(("ack", path[len(destdir) + 1:])) - if data is not None: - if STRICT_CHECK and len(data) != size: - raise IOError('file modified during rsync: %r' % (path,)) - f = open(path, 'wb') - f.write(data) - f.close() - os.utime(path, (time, time)) - del data - channel.send(("links", None)) - - msg = channel.receive() - while msg is not 42: - # we get symlink - _type, relpath, linkpoint = msg - assert _type == "link" - path = os.path.join(destdir, relpath) - try: - os.unlink(path) - except OSError: - pass - - os.symlink(os.path.join(destdir, linkpoint), path) - msg = channel.receive() - channel.send(("done", None)) - Deleted: /py/trunk/py/test/rsession/testing/test_config.py ============================================================================== --- /py/trunk/py/test/rsession/testing/test_config.py Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,24 +0,0 @@ - -""" test session config options -""" - -import py -from py.__.test.rsession.rsession import session_options, SessionOptions,\ - remote_options - -def test_session_opts(): - tmpdir = py.test.ensuretemp("sessionopts") - tmpdir.ensure("conftest.py").write("""class SessionOptions: - max_tasks_per_node = 5 - nice_level = 10 - """) - tmp2 = py.test.ensuretemp("xxx") - args = [str(tmpdir)] - config = py.test.config._reparse(args) - session_options.bind_config(config) - assert session_options.max_tasks_per_node == 5 - assert remote_options.nice_level == 10 - config = py.test.config._reparse([str(tmp2)]) - session_options.bind_config(config) - assert session_options.max_tasks_per_node == \ - SessionOptions.defaults['max_tasks_per_node'] Deleted: /py/trunk/py/test/rsession/testing/test_rsession.py.merge.tmp ============================================================================== --- /py/trunk/py/test/rsession/testing/test_rsession.py.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,324 +0,0 @@ - -""" Tests various aspects of rsession, like ssh hosts setup/teardown -""" - -import py -from py.__.test.rsession import report -from py.__.test.rsession.rsession import RSession, parse_directories,\ - parse_directories -from py.__.test.rsession.hostmanage import HostOptions, HostManager,\ - HostInfo -from py.__.test.rsession.testing.test_slave import funcfail_spec,\ - funcpass_spec, funcskip_spec, funcprint_spec, funcprintfail_spec, \ - funcoptioncustom_spec - -def setup_module(mod): - mod.pkgdir = py.path.local(py.__file__).dirpath() - -def test_setup_non_existing_hosts(): - setup_events = [] - hosts = [HostInfo("alskdjalsdkjasldkajlsd")] - hm = HostManager(hosts, None, pkgdir) - cmd = "hm.init_hosts(setup_events.append)" - py.test.raises((py.process.cmdexec.Error, IOError, EOFError), cmd) - #assert setup_events - -def test_getpkdir(): - one = pkgdir.join("initpkg.py") - two = pkgdir.join("path", "__init__.py") - p1 = RSession.getpkgdir(one) - p2 = RSession.getpkgdir(two) - assert p1 == p2 - assert p1 == pkgdir - -def test_getpkdir_no_inits(): - tmp = py.test.ensuretemp("getpkdir1") - fn = tmp.ensure("hello.py") - assert RSession.getpkgdir(fn) == fn - -def test_make_colitems(): - one = pkgdir.join("initpkg.py") - two = pkgdir.join("path", "__init__.py") - - cols = RSession.make_colitems([one, two], baseon=pkgdir) - assert len(cols) == 2 - col_one, col_two = cols - assert col_one.listnames() == ["py", "initpkg.py"] - assert col_two.listnames() == ["py", "path", "__init__.py"] - - cols = RSession.make_colitems([one, two], baseon=pkgdir.dirpath()) - assert len(cols) == 2 - col_one, col_two = cols - assert col_one.listnames() == [pkgdir.dirpath().basename, - "py", "initpkg.py"] - assert col_two.listnames() == [pkgdir.dirpath().basename, - "py", "path", "__init__.py"] - -def test_example_tryiter(): - events = [] - tmpdir = py.test.ensuretemp("tryitertest") - tmpdir.ensure("a", "__init__.py") - tmpdir.ensure("conftest.py").write(py.code.Source(""" - import py - py.test.skip("Reason") - """)) - tmpdir.ensure("a", "test_empty.py").write(py.code.Source(""" - def test_empty(): - pass - """)) - rootcol = py.test.collect.Directory(tmpdir) - data = list(rootcol.tryiter(reporterror=events.append)) - assert len(events) == 2 - assert str(events[1][0].value) == "Reason" - -class TestRSessionRemote: - def test_example_distribution_minus_x(self): - tmpdir = py.test.ensuretemp("example_distribution_minus_x") - tmpdir.ensure("sub", "conftest.py").write(py.code.Source(""" - disthosts = [%r] - """ % ('localhost',))) - tmpdir.ensure("sub", "__init__.py") - tmpdir.ensure("sub", "test_one.py").write(py.code.Source(""" - def test_1(): - pass - def test_x(): - import py - py.test.skip("aaa") - def test_2(): - assert 0 - def test_3(): - raise ValueError(23) - def test_4(someargs): - pass - """)) - args = [str(tmpdir.join("sub")), "-x"] - config = py.test.config._reparse(args) - rsession = RSession(config) - allevents = [] - rsession.main(reporter=allevents.append) - testevents = [x for x in allevents - if isinstance(x, report.ReceivedItemOutcome)] - assert len(testevents) == 3 - assert rsession.checkfun() - - def test_example_distribution(self): - subdir = "sub_example_dist" - tmpdir = py.test.ensuretemp("example_distribution") - tmpdir.ensure(subdir, "conftest.py").write(py.code.Source(""" - disthosts = [%r] - distrsync_roots = ["%s", "py"] - """ % ('localhost', subdir))) - tmpdir.ensure(subdir, "__init__.py") - tmpdir.ensure(subdir, "test_one.py").write(py.code.Source(""" - def test_1(): - pass - def test_2(): - assert 0 - def test_3(): - raise ValueError(23) - def test_4(someargs): - pass - def test_5(): - assert __file__ != '%s' - def test_6(): - import py - assert py.__file__ != '%s' - """ % (str(tmpdir.join(subdir)), py.__file__))) - tmpdir.join("py").mksymlinkto(py.path.local(py.__file__).dirpath()) - args = [str(tmpdir.join(subdir))] - config = py.test.config._reparse(args) - rsession = RSession(config, optimise_localhost=False) - allevents = [] - rsession.main(reporter=allevents.append) - testevents = [x for x in allevents - if isinstance(x, report.ReceivedItemOutcome)] - assert len(testevents) - passevents = [i for i in testevents if i.outcome.passed] - failevents = [i for i in testevents if i.outcome.excinfo] - skippedevents = [i for i in testevents if i.outcome.skipped] - assert len(testevents) == 6 - assert len(passevents) == 3 - assert len(failevents) == 3 - tb = failevents[0].outcome.excinfo.traceback - assert str(tb[0].path).find("test_one") != -1 - assert tb[0].source.find("test_2") != -1 - assert failevents[0].outcome.excinfo.typename == 'AssertionError' - tb = failevents[1].outcome.excinfo.traceback - assert str(tb[0].path).find("test_one") != -1 - assert tb[0].source.find("test_3") != -1 - assert failevents[1].outcome.excinfo.typename == 'ValueError' - assert failevents[1].outcome.excinfo.value == '23' - tb = failevents[2].outcome.excinfo.traceback - assert failevents[2].outcome.excinfo.typename == 'TypeError' - assert str(tb[0].path).find("executor") != -1 - assert tb[0].source.find("execute") != -1 - - def test_setup_teardown_ssh(self): - hosts = [HostInfo('localhost')] - parse_directories(hosts) - setup_events = [] - teardown_events = [] - - config = py.test.config._reparse([]) - opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) - hm = HostManager(hosts, config, pkgdir, opts) - nodes = hm.init_hosts(setup_events.append) - hm.teardown_hosts(teardown_events.append, - [node.channel for node in nodes], nodes) - - count_rsyn_calls = [i for i in setup_events - if isinstance(i, report.HostRSyncing)] - assert len(count_rsyn_calls) == len([i for i in hosts]) - count_ready_calls = [i for i in setup_events - if isinstance(i, report.HostReady)] - assert len(count_ready_calls) == len([i for i in hosts]) - - # same for teardown events - teardown_wait_starts = [i for i in teardown_events - if isinstance(i, report.CallStart)] - teardown_wait_ends = [i for i in teardown_events - if isinstance(i, report.CallFinish)] - assert len(teardown_wait_starts) == len(hosts) - assert len(teardown_wait_ends) == len(hosts) - - def test_setup_teardown_run_ssh(self): - hosts = [HostInfo('localhost')] - parse_directories(hosts) - allevents = [] - - config = py.test.config._reparse([]) - opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) - hm = HostManager(hosts, config, pkgdir, opts) - nodes = hm.init_hosts(allevents.append) - - from py.__.test.rsession.testing.test_executor \ - import ItemTestPassing, ItemTestFailing, ItemTestSkipping - - rootcol = py.test.collect.Directory(pkgdir.dirpath()) - itempass = rootcol.getitembynames(funcpass_spec) - itemfail = rootcol.getitembynames(funcfail_spec) - itemskip = rootcol.getitembynames(funcskip_spec) - itemprint = rootcol.getitembynames(funcprint_spec) - - # actually run some tests - for node in nodes: - node.send(itempass) - node.send(itemfail) - node.send(itemskip) - node.send(itemprint) - - hm.teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) - - events = [i for i in allevents - if isinstance(i, report.ReceivedItemOutcome)] - passed = [i for i in events - if i.outcome.passed] - skipped = [i for i in events - if i.outcome.skipped] - assert len(passed) == 2 * len(nodes) - assert len(skipped) == len(nodes) - assert len(events) == 4 * len(nodes) - # one of passed for each node has non-empty stdout - passed_stdout = [i for i in passed if i.outcome.stdout.find('samfing') != -1] - assert len(passed_stdout) == len(nodes), passed - - def test_config_pass(self): - """ Tests options object passing master -> server - """ - allevents = [] - hosts = [HostInfo('localhost')] - parse_directories(hosts) - config = py.test.config._reparse([]) - config._overwrite('custom', 'custom') - # we need to overwrite default list to serialize - from py.__.test.rsession.master import defaultconftestnames - defaultconftestnames.append("custom") - try: - opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) - hm = HostManager(hosts, config, pkgdir, opts) - nodes = hm.init_hosts(allevents.append) - - rootcol = py.test.collect.Directory(pkgdir.dirpath()) - itempass = rootcol.getitembynames(funcoptioncustom_spec) - - for node in nodes: - node.send(itempass) - - hm.teardown_hosts(allevents.append, [node.channel for node in nodes], nodes) - events = [i for i in allevents - if isinstance(i, report.ReceivedItemOutcome)] - passed = [i for i in events - if i.outcome.passed] - skipped = [i for i in events - if i.outcome.skipped] - assert len(passed) == 1 * len(nodes) - assert len(skipped) == 0 - assert len(events) == len(passed) - finally: - defaultconftestnames.remove("custom") - - def test_nice_level(self): - """ Tests if nice level behaviour is ok - """ - allevents = [] - hosts = [HostInfo('localhost')] - parse_directories(hosts) - tmpdir = py.test.ensuretemp("nice") - tmpdir.ensure("__init__.py") - tmpdir.ensure("conftest.py").write(py.code.Source(""" - disthosts = ['localhost'] - dist_nicelevel = 10 - """)) - tmpdir.ensure("test_one.py").write("""def test_nice(): - import os - assert os.nice(0) == 10 - """) - - config = py.test.config._reparse([tmpdir]) - rsession = RSession(config) - allevents = [] - rsession.main(reporter=allevents.append) - testevents = [x for x in allevents - if isinstance(x, report.ReceivedItemOutcome)] - passevents = [x for x in testevents if x.outcome.passed] - assert len(passevents) == 1 - -class XxxTestDirectories(object): - # need complete rewrite, and unsure if it makes sense at all - def test_simple_parse(self): - sshhosts = [HostInfo(i) for i in ['h1', 'h2', 'h3']] - parse_directories(sshhosts) - - def test_sophisticated_parse(self): - sshhosts = ['a at h1:/tmp', 'h2:tmp', 'h3'] - dirs = parse_directories(sshhosts) - assert py.builtin.sorted( - dirs.values()) == ['/tmp', 'pytestcache', 'tmp'] - - def test_parse_multiple_hosts(self): - hosts = ['h1', 'h1', 'h1:/tmp'] - dirs = parse_directories(hosts) - assert dirs == {(0, 'h1'): 'pytestcache', (1, 'h1'): 'pytestcache', - (2, 'h1'):'/tmp'} - -class TestInithosts(object): - def test_inithosts(self): - testevents = [] - hostnames = ['h1:/tmp', 'h1:/tmp', 'h1:/other', 'h2', 'h2:home'] - hosts = [HostInfo(i) for i in hostnames] - parse_directories(hosts) - config = py.test.config._reparse([]) - opts = HostOptions(do_sync=False, create_gateways=False) - hm = HostManager(hosts, config, pkgdir, opts) - nodes = hm.init_hosts(testevents.append) - events = [i for i in testevents if isinstance(i, report.HostRSyncing)] - assert len(events) == 4 - assert events[0].host.hostname == 'h1' - assert events[0].host.relpath == '/tmp-h1' - assert events[1].host.hostname == 'h1' - assert events[1].host.relpath == '/other-h1' - assert events[2].host.hostname == 'h2' - assert events[2].host.relpath == 'pytestcache-h2' - assert events[3].host.hostname == 'h2' - assert events[3].host.relpath == 'home-h2' - Deleted: /py/trunk/py/test/rsession/testing/test_rsync.py ============================================================================== --- /py/trunk/py/test/rsession/testing/test_rsync.py Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,80 +0,0 @@ -import py -from py.__.test.rsession.rsync import RSync - - -def setup_module(mod): - mod.gw = py.execnet.PopenGateway() - mod.gw2 = py.execnet.PopenGateway() - -def teardown_module(mod): - mod.gw.exit() - mod.gw2.exit() - - -def test_dirsync(): - base = py.test.ensuretemp('dirsync') - dest = base.join('dest') - dest2 = base.join('dest2') - source = base.mkdir('source') - - for s in ('content1', 'content2-a-bit-longer'): - source.ensure('subdir', 'file1').write(s) - rsync = RSync() - rsync.add_target(gw, dest) - rsync.add_target(gw2, dest2) - rsync.send(source) - assert dest.join('subdir').check(dir=1) - assert dest.join('subdir', 'file1').check(file=1) - assert dest.join('subdir', 'file1').read() == s - assert dest2.join('subdir').check(dir=1) - assert dest2.join('subdir', 'file1').check(file=1) - assert dest2.join('subdir', 'file1').read() == s - - source.join('subdir').remove('file1') - rsync = RSync() - rsync.add_target(gw2, dest2) - rsync.add_target(gw, dest) - rsync.send(source) - assert dest.join('subdir', 'file1').check(file=1) - assert dest2.join('subdir', 'file1').check(file=1) - rsync = RSync(delete=True) - rsync.add_target(gw2, dest2) - rsync.add_target(gw, dest) - rsync.send(source) - assert not dest.join('subdir', 'file1').check() - assert not dest2.join('subdir', 'file1').check() - -def test_symlink_rsync(): - if py.std.sys.platform == 'win32': - py.test.skip("symlinks are unsupported on Windows.") - base = py.test.ensuretemp('symlinkrsync') - dest = base.join('dest') - source = base.join('source') - source.ensure("existant") - source.join("rellink").mksymlinkto(source.join("existant"), absolute=0) - source.join('abslink').mksymlinkto(source.join("existant")) - - rsync = RSync() - rsync.add_target(gw, dest) - rsync.send(source) - - assert dest.join('rellink').readlink() == dest.join("existant") - assert dest.join('abslink').readlink() == dest.join("existant") - -def test_callback(): - base = py.test.ensuretemp('callback') - dest = base.join("dest") - source = base.join("source") - source.ensure("existant").write("a" * 100) - source.ensure("existant2").write("a" * 10) - total = {} - def callback(cmd, lgt, channel): - total[(cmd, lgt)] = True - - rsync = RSync(callback=callback) - #rsync = RSync() - rsync.add_target(gw, dest) - rsync.send(source) - - assert total == {("list", 110):True, ("ack", 100):True, ("ack", 10):True} - Deleted: /py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp ============================================================================== --- /py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,138 +0,0 @@ -import py - -try: - import pypy - from pypy.translator.js.modules import dom - from pypy.translator.js.tester import schedule_callbacks - from py.__.test.rsession.rsession import session_options - dom.Window # check whether dom was properly imported or is just a - # leftover in sys.modules -except (ImportError, AttributeError): - py.test.skip('PyPy not found') - -from py.__.test.rsession import webjs -from py.__.test.rsession.web import exported_methods -here = py.magic.autopath().dirpath() - -def setup_module(mod): - # load HTML into window object - html = here.join('../webdata/index.html').read() - mod.html = html - from pypy.translator.js.modules import dom - mod.dom = dom - dom.window = dom.Window(html) - dom.document = dom.window.document - config = py.test.config._reparse([]) - config._overwrite('_dist_import_pypy', True) - from py.__.test.rsession import webjs - from py.__.test.rsession.web import exported_methods - mod.webjs = webjs - mod.exported_methods = exported_methods - -def setup_function(f): - dom.window = dom.Window(html) - dom.document = dom.window.document - -def test_html_loaded(): - body = dom.window.document.getElementsByTagName('body')[0] - assert len(body.childNodes) > 0 - assert str(body.childNodes[1].nodeName) == 'A' - -def test_set_msgbox(): - msgbox = dom.window.document.getElementById('messagebox') - assert len(msgbox.childNodes) == 0 - webjs.set_msgbox('foo', 'bar') - assert len(msgbox.childNodes) == 1 - assert msgbox.childNodes[0].nodeName == 'PRE' - assert msgbox.childNodes[0].childNodes[0].nodeValue == 'foo\nbar' - -def test_show_info(): - info = dom.window.document.getElementById('info') - info.style.visibility = 'hidden' - info.innerHTML = '' - webjs.show_info('foobar') - content = info.innerHTML - assert content == 'foobar' - bgcolor = info.style.backgroundColor - assert bgcolor == 'beige' - -def test_hide_info(): - info = dom.window.document.getElementById('info') - info.style.visibility = 'visible' - webjs.hide_info() - assert info.style.visibility == 'hidden' - -def test_process(): - main_t = dom.window.document.getElementById('main_table') - assert len(main_t.getElementsByTagName('tr')) == 0 - assert not webjs.process({}) - - msg = {'type': 'ItemStart', - 'itemtype': 'Module', - 'itemname': 'foo.py', - 'fullitemname': 'modules/foo.py', - 'length': 10, - } - assert webjs.process(msg) - trs = main_t.getElementsByTagName('tr') - assert len(trs) == 1 - tr = trs[0] - assert len(tr.childNodes) == 2 - assert tr.childNodes[0].nodeName == 'TD' - assert tr.childNodes[0].innerHTML == 'foo.py[0/10]' - assert tr.childNodes[1].nodeName == 'TD' - assert tr.childNodes[1].childNodes[0].nodeName == 'TABLE' - assert len(tr.childNodes[1].getElementsByTagName('tr')) == 0 - -def test_process_two(): - main_t = dom.window.document.getElementById('main_table') - msg = {'type': 'ItemStart', - 'itemtype': 'Module', - 'itemname': 'foo.py', - 'fullitemname': 'modules/foo.py', - 'length': 10, - } - webjs.process(msg) - msg = {'type': 'ReceivedItemOutcome', - 'fullmodulename': 'modules/foo.py', - 'passed' : 'True', - 'fullitemname' : 'modules/foo.py/test_item', - 'hostkey': None, - } - webjs.process(msg) - trs = main_t.getElementsByTagName('tr') - tds = trs[0].getElementsByTagName('td') - # two cells in the row, one in the table inside one of the cells - assert len(tds) == 3 - html = tds[0].innerHTML - assert html == 'foo.py[1/10]' - assert tds[2].innerHTML == '.' - -def test_signal(): - main_t = dom.window.document.getElementById('main_table') - msg = {'type': 'ItemStart', - 'itemtype': 'Module', - 'itemname': 'foo.py', - 'fullitemname': 'modules/foo.py', - 'length': 10, - } - webjs.process(msg) - msg = {'type': 'ReceivedItemOutcome', - 'fullmodulename': 'modules/foo.py', - 'passed' : 'False', - 'fullitemname' : 'modules/foo.py/test_item', - 'hostkey': None, - 'signal': '10', - 'skipped': 'False', - } - exported_methods.fail_reasons['modules/foo.py/test_item'] = 'Received signal 10' - exported_methods.stdout['modules/foo.py/test_item'] = '' - exported_methods.stderr['modules/foo.py/test_item'] = '' - webjs.process(msg) - schedule_callbacks(exported_methods) - # ouch - assert dom.document.getElementById('modules/foo.py').childNodes[0].\ - childNodes[0].childNodes[0].childNodes[0].nodeValue == 'F' - -# XXX: Write down test for full run - Deleted: /py/trunk/py/test/rsession/web.py.merge.tmp ============================================================================== --- /py/trunk/py/test/rsession/web.py.merge.tmp Wed Jan 24 17:46:46 2007 +++ (empty file) @@ -1,430 +0,0 @@ - -""" web server for py.test -""" - -from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler - -import thread, threading -import re -import time -import random -import Queue -import os -import sys -import socket - -import py -from py.__.test.rsession.rsession import RSession -from py.__.test.rsession import report -from py.__.test import collect -from py.__.test.rsession.webdata import json - -DATADIR = py.path.local(__file__).dirpath("webdata") -FUNCTION_LIST = ["main", "show_skip", "show_traceback", "show_info", "hide_info", - "show_host", "hide_host", "hide_messagebox", "opt_scroll"] - -try: - try: - if not py.test.config.getvalue('_dist_import_pypy'): - raise ImportError - except AttributeError: - pass - from pypy.rpython.ootypesystem.bltregistry import MethodDesc, BasicExternal,\ - described - from pypy.translator.js.main import rpython2javascript - from pypy.translator.js import commproxy - from pypy.rpython.extfunc import _callable - - commproxy.USE_MOCHIKIT = False - IMPORTED_PYPY = True -except (ImportError, NameError): - class BasicExternal(object): - pass - - def described(*args, **kwargs): - def decorator(func): - return func - return decorator - - def _callable(*args, **kwargs): - pass - - IMPORTED_PYPY = False - -def add_item(event): - """ A little helper - """ - item = event.item - itemtype = item.__class__.__name__ - itemname = item.name - fullitemname = "/".join(item.listnames()) - d = {'fullitemname': fullitemname, 'itemtype': itemtype, - 'itemname': itemname} - #if itemtype == 'Module': - try: - d['length'] = str(len(list(event.item.tryiter()))) - except: - d['length'] = "?" - return d - -class MultiQueue(object): - """ a tailor-made queue (internally using Queue) for py.test.rsession.web - - API-wise the main difference is that the get() method gets a sessid - argument, which is used to determine what data to feed to the client - - when a data queue for a sessid doesn't yet exist, it is created, and - filled with data that has already been fed to the other clients - """ - def __init__(self): - self._cache = [] - self._session_queues = {} - self._lock = py.std.thread.allocate_lock() - - def put(self, item): - self._lock.acquire() - try: - self._cache.append(item) - for key, q in self._session_queues.items(): - q.put(item) - finally: - self._lock.release() - - def _del(self, sessid): - self._lock.acquire() - try: - del self._session_queues[sessid] - finally: - self._lock.release() - - def get(self, sessid): - self._lock.acquire() - try: - if not sessid in self._session_queues: - self._create_session_queue(sessid) - finally: - self._lock.release() - return self._session_queues[sessid].get(sessid) - - def empty(self): - self._lock.acquire() - try: - if not self._session_queues: - return not len(self._cache) - for q in self._session_queues.values(): - if not q.empty(): - return False - finally: - self._lock.release() - return True - - def empty_queue(self, sessid): - return self._session_queues[sessid].empty() - - def _create_session_queue(self, sessid): - self._session_queues[sessid] = q = Queue.Queue() - for item in self._cache: - q.put(item) - -class ExportedMethods(BasicExternal): - _render_xmlhttp = True - def __init__(self): - self.pending_events = MultiQueue() - self.start_event = threading.Event() - self.end_event = threading.Event() - self.skip_reasons = {} - self.fail_reasons = {} - self.stdout = {} - self.stderr = {} - self.all = 0 - - def findmodule(self, item): - # find the most outwards parent which is module - current = item - while current: - if isinstance(current, collect.Module): - break - current = current.parent - - if current is not None: - return str(current.name), str("/".join(current.listnames())) - else: - return str(item.parent.name), str("/".join(item.parent.listnames())) - - def show_hosts(self): - self.start_event.wait() - to_send = {} - for host in self.hosts: - to_send[host.hostid] = host.hostname - return to_send - show_hosts = described(retval={str:str}, args=[('callback', - _callable([{str:str}]))])(show_hosts) - - def show_skip(self, item_name="aa"): - return {'item_name': item_name, - 'reason': self.skip_reasons[item_name]} - show_skip = described(retval={str:str}, args=[('item_name',str),('callback', - _callable([{str:str}]))])(show_skip) - - def show_fail(self, item_name="aa"): - return {'item_name':item_name, - 'traceback':str(self.fail_reasons[item_name]), - 'stdout':self.stdout[item_name], - 'stderr':self.stderr[item_name]} - show_fail = described(retval={str:str}, args=[('item_name',str),('callback', - _callable([{str:str}]))])(show_fail) - - _sessids = None - _sesslock = py.std.thread.allocate_lock() - def show_sessid(self): - if not self._sessids: - self._sessids = [] - self._sesslock.acquire() - try: - while 1: - chars = list(py.std.string.lowercase) - py.std.random.shuffle(chars) - sessid = ''.join(chars[:8]) - if sessid not in self._sessids: - self._sessids.append(sessid) - break - finally: - self._sesslock.release() - return sessid - show_sessid = described(retval=str, args=[('callback', - _callable([str]))])(show_sessid) - - def failed(self, **kwargs): - if not 'sessid' in kwargs: - return - sessid = kwargs['sessid'] - to_del = -1 - for num, i in enumerate(self._sessids): - if i == sessid: - to_del = num - if to_del != -1: - del self._sessids[to_del] - self.pending_events._del(kwargs['sessid']) - - def show_all_statuses(self, sessid=-1): - retlist = [self.show_status_change(sessid)] - while not self.pending_events.empty_queue(sessid): - retlist.append(self.show_status_change(sessid)) - retval = retlist - return retval - show_all_statuses = described(retval=[{str:str}],args= - [('sessid',str), ('callback',_callable([[{str:str}]]))])(show_all_statuses) - - def show_status_change(self, sessid): - event = self.pending_events.get(sessid) - if event is None: - self.end_event.set() - return {} - # some dispatcher here - if isinstance(event, report.ReceivedItemOutcome): - args = {} - outcome = event.outcome - for key, val in outcome.__dict__.iteritems(): - args[key] = str(val) - args.update(add_item(event)) - mod_name, mod_fullname = self.findmodule(event.item) - args['modulename'] = str(mod_name) - args['fullmodulename'] = str(mod_fullname) - fullitemname = args['fullitemname'] - if outcome.skipped: - self.skip_reasons[fullitemname] = outcome.skipped - elif outcome.excinfo: - self.fail_reasons[fullitemname] = self.repr_failure_tblong( - event.item, outcome.excinfo, outcome.excinfo.traceback) - self.stdout[fullitemname] = outcome.stdout - self.stderr[fullitemname] = outcome.stderr - elif outcome.signal: - self.fail_reasons[fullitemname] = "Received signal %d" % outcome.signal - self.stdout[fullitemname] = outcome.stdout - self.stderr[fullitemname] = outcome.stderr - if event.channel: - args['hostkey'] = event.channel.gateway.host.hostid - else: - args['hostkey'] = '' - elif isinstance(event, report.ItemStart): - args = add_item(event) - elif isinstance(event, report.TestFinished): - args = {} - args['run'] = str(self.all) - args['fails'] = str(len(self.fail_reasons)) - args['skips'] = str(len(self.skip_reasons)) - elif isinstance(event, report.SendItem): - args = add_item(event) - args['hostkey'] = event.channel.gateway.host.hostid - elif isinstance(event, report.HostReady): - self.ready_hosts[event.host] = True - args = {'hostname' : event.host.hostname, 'hostkey' : event.host.hostid} - elif isinstance(event, report.FailedTryiter): - args = add_item(event) - elif isinstance(event, report.SkippedTryiter): - args = add_item(event) - args['reason'] = str(event.excinfo.value) - else: - args = {} - args['event'] = str(event) - args['type'] = event.__class__.__name__ - return args - - def repr_failure_tblong(self, item, excinfo, traceback): - lines = [] - for index, entry in py.builtin.enumerate(traceback): - lines.append('----------') - lines.append("%s: %s" % (entry.path, entry.lineno)) - lines += self.repr_source(entry.relline, entry.source) - lines.append("%s: %s" % (excinfo.typename, excinfo.value)) - return "\n".join(lines) - - def repr_source(self, relline, source): - lines = [] - for num, line in enumerate(source.split("\n")): - if num == relline: - lines.append(">>>>" + line) - else: - lines.append(" " + line) - return lines - - def report_ReceivedItemOutcome(self, event): - self.all += 1 - self.pending_events.put(event) - - def report_ItemStart(self, event): - if isinstance(event.item, py.test.collect.Module): - self.pending_events.put(event) - - def report_unknown(self, event): - # XXX: right now, we just pass it for showing - self.pending_events.put(event) - - def report_TestStarted(self, event): - # XXX: It overrides out self.hosts - self.hosts = {} - self.ready_hosts = {} - for host in event.hosts: - self.hosts[host] = host - self.ready_hosts[host] = False - self.start_event.set() - self.pending_events.put(event) - - def report(self, what): - repfun = getattr(self, "report_" + what.__class__.__name__, - self.report_unknown) - try: - repfun(what) - except (KeyboardInterrupt, SystemExit): - raise - except: - print "Internal reporting problem" - excinfo = py.code.ExceptionInfo() - for i in excinfo.traceback: - print str(i)[2:-1] - print excinfo - -## try: -## self.wait_flag.acquire() -## self.pending_events.insert(0, event) -## self.wait_flag.notify() -## finally: -## self.wait_flag.release() - -exported_methods = ExportedMethods() - -class TestHandler(BaseHTTPRequestHandler): - exported_methods = exported_methods - - def do_GET(self): - path = self.path - if path.endswith("/"): - path = path[:-1] - if path.startswith("/"): - path = path[1:] - m = re.match('^(.*)\?(.*)$', path) - if m: - path = m.group(1) - getargs = m.group(2) - else: - getargs = "" - name_path = path.replace(".", "_") - method_to_call = getattr(self, "run_" + name_path, None) - if method_to_call is None: - exec_meth = getattr(self.exported_methods, name_path, None) - if exec_meth is None: - self.send_error(404, "File %s not found" % path) - else: - try: - self.serve_data('text/json', - json.write(exec_meth(**self.parse_args(getargs)))) - except socket.error: - # client happily disconnected - exported_methods.failed(**self.parse_args(getargs)) - else: - method_to_call() - - def parse_args(self, getargs): - # parse get argument list - if getargs == "": - return {} - - unquote = py.std.urllib.unquote - args = {} - arg_pairs = getargs.split("&") - for arg in arg_pairs: - key, value = arg.split("=") - args[unquote(key)] = unquote(value) - return args - - def log_message(self, format, *args): - # XXX just discard it - pass - - do_POST = do_GET - - def run_(self): - self.run_index() - - def run_index(self): - data = py.path.local(DATADIR).join("index.html").open().read() - self.serve_data("text/html", data) - - def run_jssource(self): - js_name = py.path.local(__file__).dirpath("webdata").join("source.js") - web_name = py.path.local(__file__).dirpath().join("webjs.py") - if IMPORTED_PYPY and web_name.mtime() > js_name.mtime(): - from py.__.test.rsession import webjs - - javascript_source = rpython2javascript(webjs, - FUNCTION_LIST, use_pdb=False) - open(str(js_name), "w").write(javascript_source) - self.serve_data("text/javascript", javascript_source) - else: - js_source = open(str(js_name), "r").read() - self.serve_data("text/javascript", js_source) - - def serve_data(self, content_type, data): - self.send_response(200) - self.send_header("Content-type", content_type) - self.send_header("Content-length", len(data)) - self.end_headers() - self.wfile.write(data) - -def start_server(server_address = ('', 8000), handler=TestHandler, start_new=True): - httpd = HTTPServer(server_address, handler) - - if start_new: - thread.start_new_thread(httpd.serve_forever, ()) - print "Server started, listening on port %d" % (httpd.server_port,) - return httpd - else: - print "Server started, listening on port %d" % (httpd.server_port,) - httpd.serve_forever() - -def kill_server(): - exported_methods.pending_events.put(None) - while not exported_methods.pending_events.empty(): - time.sleep(.1) - exported_methods.end_event.wait() - From hpk at codespeak.net Wed Jan 24 18:10:33 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 18:10:33 +0100 (CET) Subject: [py-svn] r37281 - py/trunk/py/misc/testing Message-ID: <20070124171033.0A83510078@code0.codespeak.net> Author: hpk Date: Wed Jan 24 18:10:32 2007 New Revision: 37281 Modified: py/trunk/py/misc/testing/test_initpkg.py Log: omit tracer test directory for imports (XXX example Filesystem trees should be created from code and not reside in SVN) Modified: py/trunk/py/misc/testing/test_initpkg.py ============================================================================== --- py/trunk/py/misc/testing/test_initpkg.py (original) +++ py/trunk/py/misc/testing/test_initpkg.py Wed Jan 24 18:10:32 2007 @@ -51,6 +51,7 @@ nodirs = ( base.join('test', 'tkinter'), base.join('test', 'testing', 'data'), + base.join('apigen', 'tracer', 'testing', 'package'), base.join('test', 'testing', 'test'), base.join('magic', 'greenlet.py'), base.join('path', 'extpy', 'testing', 'test_data'), From hpk at codespeak.net Wed Jan 24 18:16:54 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 18:16:54 +0100 (CET) Subject: [py-svn] r37283 - py/branch/config Message-ID: <20070124171654.9FB6610078@code0.codespeak.net> Author: hpk Date: Wed Jan 24 18:16:53 2007 New Revision: 37283 Removed: py/branch/config/ Log: remove config branch for now to avoid confusion From hpk at codespeak.net Wed Jan 24 18:24:22 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 18:24:22 +0100 (CET) Subject: [py-svn] r37285 - py/trunk/py/test Message-ID: <20070124172422.3442210078@code0.codespeak.net> Author: hpk Date: Wed Jan 24 18:24:21 2007 New Revision: 37285 Removed: py/trunk/py/test/session-options.txt Log: this file describing option is obsolete now Deleted: /py/trunk/py/test/session-options.txt ============================================================================== --- /py/trunk/py/test/session-options.txt Wed Jan 24 18:24:21 2007 +++ (empty file) @@ -1,33 +0,0 @@ -RSession options: - -class SessionOptions: - nice_level - how to nice remote prcesses (RSession) - boxing_policy - run with boxes or not (LSession) - max_tasks_per_node (RSession) - waittime - how long to wait till considering node dead (not fully working, - RSession) - import_pypy - try to import pypy for regenerating web js (RSession, LSession) - -user provided options: - -startserver - run web server for displaying output (RSession, LSession), - implies LSession -runbrowser - use webbrowser - implies startserver -rest - implies LSession -apigen - implies LSession - -other conftest options: - -dist_rsyncroots - RSession -disthosts - RSession -dist_remotepython - RSession - -various stuff: - -we_are_remote - flag to indicate whether we are in remote process, not - available for user. - -options that does not work in L/RSession: - -looponfailing -exec From fijal at codespeak.net Wed Jan 24 18:30:30 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 24 Jan 2007 18:30:30 +0100 (CET) Subject: [py-svn] r37286 - py/trunk/py/test/rsession Message-ID: <20070124173030.38E5B10076@code0.codespeak.net> Author: fijal Date: Wed Jan 24 18:30:29 2007 New Revision: 37286 Modified: py/trunk/py/test/rsession/local.py Log: Pass a config object deeper in hierarchy Modified: py/trunk/py/test/rsession/local.py ============================================================================== --- py/trunk/py/test/rsession/local.py (original) +++ py/trunk/py/test/rsession/local.py Wed Jan 24 18:30:29 2007 @@ -37,7 +37,7 @@ raise NotImplementedError() def apigen_runner(item, session, reporter): - r = RunExecutor(item, reporter=reporter) + r = RunExecutor(item, reporter=reporter, config=session.config) session.tracer.start_tracing() retval = plain_runner(item, session, reporter) session.tracer.end_tracing() From hpk at codespeak.net Wed Jan 24 18:48:14 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 18:48:14 +0100 (CET) Subject: [py-svn] r37287 - py/trunk/py/test Message-ID: <20070124174814.8979910069@code0.codespeak.net> Author: hpk Date: Wed Jan 24 18:48:13 2007 New Revision: 37287 Modified: py/trunk/py/test/session.py Log: don't eat exception, simply use finally Modified: py/trunk/py/test/session.py ============================================================================== --- py/trunk/py/test/session.py (original) +++ py/trunk/py/test/session.py Wed Jan 24 18:48:13 2007 @@ -42,13 +42,12 @@ try: self.header(colitems) try: - for colitem in colitems: - self.runtraced(colitem) - except KeyboardInterrupt: - raise - except: - self.footer(colitems) - else: + try: + for colitem in colitems: + self.runtraced(colitem) + except KeyboardInterrupt: + raise + finally: self.footer(colitems) except Exit, ex: pass From hpk at codespeak.net Wed Jan 24 18:56:02 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 18:56:02 +0100 (CET) Subject: [py-svn] r37288 - py/trunk/py/doc Message-ID: <20070124175602.DA69C10069@code0.codespeak.net> Author: hpk Date: Wed Jan 24 18:56:02 2007 New Revision: 37288 Modified: py/trunk/py/doc/TODO.txt Log: added some RSession related TODOs Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Wed Jan 24 18:56:02 2007 @@ -106,9 +106,12 @@ (done) -distributed testing ----------------------- +distributed testing / RSession +------------------------------------ +* cleanup initialisation of config / get rid of pkgdir +* unify option names (dist_*) +* (optional) see if more of py/test/session.py's Session can be reused code quality ----------------- From hpk at codespeak.net Wed Jan 24 20:16:28 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 20:16:28 +0100 (CET) Subject: [py-svn] r37289 - py/trunk/py/doc Message-ID: <20070124191628.2256410069@code0.codespeak.net> Author: hpk Date: Wed Jan 24 20:16:26 2007 New Revision: 37289 Modified: py/trunk/py/doc/TODO.txt Log: todotodo Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Wed Jan 24 20:16:26 2007 @@ -68,21 +68,18 @@ APIGEN / source viewer ------------------------------------- -* make py.test --apigen=PATH_TO_SCRIPT +* (DONE) make py.test --apigen=PATH_TO_SCRIPT collect tracing information and call the apigen script to produce api and source code documentation - (done) - * deploy the above "py.test --apigen" run on codespeak regularly, determine directory locations and URL namespace design. -* integrate rest directive into py/documentation/conftest.py +* (DONE, XXX functions/methods?) integrate rest directive into + py/documentation/conftest.py with help code from py.__.rest.directive.... make sure that the txt files in py/documentation/ use it - (done XXX functions/methods) - testing ----------- @@ -94,18 +91,11 @@ - running "py.test --looponfailing" - running "py.test" distributed on some hosts -* consider --box on trunk (XXX guido - find tests that depend on each other) - -* tests should not create any tempdirectories in the source code base +* make --box run on the trunk - - (done) - -* try to be as 2.2 compatible as possible +* (done) try to be as 2.2 compatible as possible (use e.g. py.builtin.enumerate instead of "enumerate" directly) - (done) - distributed testing / RSession ------------------------------------ From hpk at codespeak.net Wed Jan 24 20:18:47 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 20:18:47 +0100 (CET) Subject: [py-svn] r37290 - in py/trunk/py: doc test test/testing Message-ID: <20070124191847.68BFC10069@code0.codespeak.net> Author: hpk Date: Wed Jan 24 20:18:46 2007 New Revision: 37290 Modified: py/trunk/py/doc/test.txt py/trunk/py/test/config.py py/trunk/py/test/defaultconftest.py py/trunk/py/test/testing/test_config.py Log: * allow only CAPITAL letters for short options * documentation and test for it * streamlined documentation a bit Modified: py/trunk/py/doc/test.txt ============================================================================== --- py/trunk/py/doc/test.txt (original) +++ py/trunk/py/doc/test.txt Wed Jan 24 20:18:46 2007 @@ -485,6 +485,28 @@ XXX +adding custom options ++++++++++++++++++++++++ + +To register a project-specific command line option +you may have the following code within a ``conftest.py`` file:: + + import py + Option = py.test.config.Option + option = py.test.config.addoptions("pypy options", + Option('-V', '--view', action="store_true", dest="view", default=False, + help="view translation tests' flow graphs with Pygame"), + ) + +and you can then access ``option.view`` like this:: + + if option.view: + print "view this!" + +The option will be available if you type ``py.test -h`` +Note that you may only register upper case short +options. ``py.test`` reserves all lower +case short options for its own cross-project usage. customizing the collecting and running process ----------------------------------------------- @@ -671,7 +693,7 @@ * **`dist_hosts`**: a required list of ssh addresses (which each may include a path, default path is: ``$HOME/pytestcache-HOSTNAME``) -* `dist_rsync_roots` - a list of packages to copy to the remote machines. +* `dist_rsyncroots` - a list of packages to copy to the remote machines. * `dist_remotepython` - the remote python executable to run. * `dist_nicelevel` - process priority of remote nodes. * `dist_boxing` - will run each single test in a separate process @@ -681,7 +703,7 @@ Sample configuration:: dist_hosts = ['localhost', 'user at someserver:/tmp/somedir'] - dist_rsync_roots = ['pypy', 'py'] + dist_rsyncroots = ['pypy', 'py'] dist_remotepython = 'python2.4' dist_nicelevel = 10 dist_boxing = True Modified: py/trunk/py/test/config.py ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py Wed Jan 24 20:18:46 2007 @@ -2,6 +2,7 @@ import py from conftesthandle import Conftest +from py.__.test.defaultconftest import adddefaultoptions optparse = py.compat.optparse @@ -42,8 +43,8 @@ assert not self._initialized, ( "can only parse cmdline args once per Config object") self._initialized = True + adddefaultoptions(self) self.conftest.setinitial(args) - self.conftest.rget('adddefaultoptions')() args = [str(x) for x in args] cmdlineoption, args = self._parser.parse_args(args) self.option.__dict__.update(vars(cmdlineoption)) @@ -89,6 +90,16 @@ """ add a named group of options to the current testing session. This function gets invoked during testing session initialization. """ + for spec in specs: + for shortopt in spec._short_opts: + if not shortopt.isupper(): + raise ValueError( + "custom options must be capital letter " + "got %r" %(spec,) + ) + return self._addoptions(groupname, *specs) + + def _addoptions(self, groupname, *specs): optgroup = optparse.OptionGroup(self._parser, groupname) optgroup.add_options(specs) self._parser.add_option_group(optgroup) Modified: py/trunk/py/test/defaultconftest.py ============================================================================== --- py/trunk/py/test/defaultconftest.py (original) +++ py/trunk/py/test/defaultconftest.py Wed Jan 24 20:18:46 2007 @@ -28,9 +28,9 @@ # =================================================== -Option = py.test.config.Option -def adddefaultoptions(): - py.test.config.addoptions('general options', +def adddefaultoptions(config): + Option = config.Option + config._addoptions('general options', Option('-v', '--verbose', action="count", dest="verbose", default=0, help="increase verbosity."), @@ -68,7 +68,7 @@ help="trace considerations of conftest.py files."), ) - py.test.config.addoptions('EXPERIMENTAL options', + config._addoptions('EXPERIMENTAL options', Option('-f', '--looponfailing', action="store_true", dest="looponfailing", default=False, help="loop on failing test set."), Modified: py/trunk/py/test/testing/test_config.py ============================================================================== --- py/trunk/py/test/testing/test_config.py (original) +++ py/trunk/py/test/testing/test_config.py Wed Jan 24 20:18:46 2007 @@ -17,20 +17,38 @@ option.tdest = True Option = py.test.config.Option option = py.test.config.addoptions("testing group", - Option('-g', '--glong', action="store", default=42, + Option('-G', '--glong', action="store", default=42, type="int", dest="gdest", help="g value."), # XXX note: special case, option without a destination - Option('-t', '--tlong', action="callback", callback=_callback, + Option('-T', '--tlong', action="callback", callback=_callback, help='t value'), ) """)) old = o.chdir() try: - config = py.test.config._reparse(['-g', '17']) + config = py.test.config._reparse(['-G', '17']) finally: old.chdir() assert config.option.gdest == 17 +def test_config_cmdline_options_only_lowercase(): + o = py.test.ensuretemp('test_config_cmdline_options_only_lowercase') + o.ensure("conftest.py").write(py.code.Source(""" + import py + Option = py.test.config.Option + options = py.test.config.addoptions("testing group", + Option('-g', '--glong', action="store", default=42, + type="int", dest="gdest", help="g value."), + ) + """)) + old = o.chdir() + try: + py.test.raises(ValueError, """ + py.test.config._reparse(['-g', '17']) + """) + finally: + old.chdir() + def test_parsing_again_fails(): dir = py.test.ensuretemp("parsing_again_fails") config = py.test.config._reparse([str(dir)]) @@ -160,10 +178,10 @@ import py Option = py.test.config.Option option = py.test.config.addoptions("testing group", - Option('-g', '--glong', action="store", default=42, + Option('-G', '--glong', action="store", default=42, type="int", dest="gdest", help="g value.")) """)) - config = py.test.config._reparse([tmp, "-g", "11"]) + config = py.test.config._reparse([tmp, "-G", "11"]) assert config.option.gdest == 11 repr = config.make_repr(conftestnames=[]) config = py.test.config._reparse([tmp.dirpath()]) From hpk at codespeak.net Wed Jan 24 20:35:24 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 20:35:24 +0100 (CET) Subject: [py-svn] r37291 - py/trunk/py/doc Message-ID: <20070124193524.66BA110069@code0.codespeak.net> Author: hpk Date: Wed Jan 24 20:35:23 2007 New Revision: 37291 Modified: py/trunk/py/doc/TODO.txt Log: seediff Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Wed Jan 24 20:35:23 2007 @@ -91,9 +91,14 @@ - running "py.test --looponfailing" - running "py.test" distributed on some hosts +* see why startcapture() does not use FD-based + "py.io.OutErrCapture" to isolate standard output. + use that check if all py and PyPy tests pass + as good as they do without. + * make --box run on the trunk -* (done) try to be as 2.2 compatible as possible +* (DONE more or less) try to be as 2.2 compatible as possible (use e.g. py.builtin.enumerate instead of "enumerate" directly) distributed testing / RSession @@ -117,12 +122,12 @@ py.test ------- -* adjust py.test documentation to reflect new - collector/session architecture (mostly done) +* (needs review) adjust py.test documentation to reflect new + collector/session architecture -* document py.test's conftest.py approach (somewhat done) +* (in-progress) document py.test's conftest.py approach -* py.test fails to parse strangely formatted code after assertion failure +* (postponed, likely) py.test fails to parse strangely formatted code after assertion failure Missing docstrings ------------------ From fijal at codespeak.net Wed Jan 24 21:23:07 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 24 Jan 2007 21:23:07 +0100 (CET) Subject: [py-svn] r37292 - py/trunk/py/test/rsession Message-ID: <20070124202307.C0CE71006E@code0.codespeak.net> Author: fijal Date: Wed Jan 24 21:23:05 2007 New Revision: 37292 Modified: py/trunk/py/test/rsession/reporter.py Log: SkippedTryiter should be reporter more like in terminal.py Modified: py/trunk/py/test/rsession/reporter.py ============================================================================== --- py/trunk/py/test/rsession/reporter.py (original) +++ py/trunk/py/test/rsession/reporter.py Wed Jan 24 21:23:05 2007 @@ -258,7 +258,9 @@ def report_SkippedTryiter(self, event): #self.show_item(event.item, False) - self.out.write("- skipped (%s)" % event.excinfo.value) + #self.out.write("- skipped (%s)" % event.excinfo.value) + self.out.write("s") + self.skipped_tests_outcome.append(event) def report_FailedTryiter(self, event): #self.show_item(event.item, False) From fijal at codespeak.net Wed Jan 24 21:25:18 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 24 Jan 2007 21:25:18 +0100 (CET) Subject: [py-svn] r37293 - py/trunk/py/test/rsession Message-ID: <20070124202518.7272D1006E@code0.codespeak.net> Author: fijal Date: Wed Jan 24 21:25:17 2007 New Revision: 37293 Modified: py/trunk/py/test/rsession/reporter.py Log: Another aproximation :-] Modified: py/trunk/py/test/rsession/reporter.py ============================================================================== --- py/trunk/py/test/rsession/reporter.py (original) +++ py/trunk/py/test/rsession/reporter.py Wed Jan 24 21:25:17 2007 @@ -258,9 +258,11 @@ def report_SkippedTryiter(self, event): #self.show_item(event.item, False) - #self.out.write("- skipped (%s)" % event.excinfo.value) - self.out.write("s") - self.skipped_tests_outcome.append(event) + if isinstance(event.item, py.test.collect.Module): + self.out.write("- skipped (%s)" % event.excinfo.value) + else: + self.out.write("s") + self.skipped_tests_outcome.append(event) def report_FailedTryiter(self, event): #self.show_item(event.item, False) From hpk at codespeak.net Wed Jan 24 21:25:50 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 21:25:50 +0100 (CET) Subject: [py-svn] r37294 - py/trunk/py/doc Message-ID: <20070124202550.79B1410075@code0.codespeak.net> Author: hpk Date: Wed Jan 24 21:25:49 2007 New Revision: 37294 Modified: py/trunk/py/doc/TODO.txt Log: seediff Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Wed Jan 24 21:25:49 2007 @@ -101,6 +101,9 @@ * (DONE more or less) try to be as 2.2 compatible as possible (use e.g. py.builtin.enumerate instead of "enumerate" directly) +* have all sessions check their options via Session.fixoptions() + and have session-particular tests and checks accordingly. + distributed testing / RSession ------------------------------------ From guido at codespeak.net Wed Jan 24 22:04:20 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 22:04:20 +0100 (CET) Subject: [py-svn] r37297 - py/trunk/py/apigen/testing Message-ID: <20070124210420.3D95010075@code0.codespeak.net> Author: guido Date: Wed Jan 24 22:04:18 2007 New Revision: 37297 Modified: py/trunk/py/apigen/testing/test_apigen_example.py Log: Fixed dependency on order in the function argument formatting tests. Modified: py/trunk/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_example.py (original) +++ py/trunk/py/apigen/testing/test_apigen_example.py Wed Jan 24 22:04:18 2007 @@ -127,16 +127,25 @@ snippet = apb.build_callable_view('main.sub.func') html = snippet.unicode() print html - run_string_sequence_test(html, [ - 'arg1 : AnyOf(', - 'href="', - 'Class SomeClass', - 'Int>', - 'return value:', - '<None>', - 'source: %s' % (self.fs_root.join('pkg/func.py'),), - 'def func(arg1):', - ]) + # XXX somewhat grokky tests because the order of the items may change + assert 'arg1: AnyOf(' in html + pos1 = html.find('arg1: AnyOf(') + assert pos1 > -1 + pos2 = html.find('href="', pos1) + assert pos2 > pos1 + pos3 = html.find('Class SomeClass', pos2) + assert pos3 > pos2 + pos4 = html.find('Int>', pos1) + assert pos4 > pos1 + pos5 = html.find('return value:', pos4) + assert pos5 > pos4 and pos5 > pos3 + pos6 = html.find('<None>', pos5) + assert pos6 > pos5 + pos7 = html.find('source: %s' % (self.fs_root.join('pkg/func.py'),), + pos6) + assert pos7 > pos6 + pos8 = html.find('def func(arg1):', pos7) + assert pos8 > pos7 _checkhtmlsnippet(html) def test_build_function_pages(self): From fijal at codespeak.net Wed Jan 24 22:04:59 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 24 Jan 2007 22:04:59 +0100 (CET) Subject: [py-svn] r37298 - py/trunk/py/test Message-ID: <20070124210459.31E991006E@code0.codespeak.net> Author: fijal Date: Wed Jan 24 22:04:57 2007 New Revision: 37298 Modified: py/trunk/py/test/representation.py Log: (fijal, hpk) - bugfix Modified: py/trunk/py/test/representation.py ============================================================================== --- py/trunk/py/test/representation.py (original) +++ py/trunk/py/test/representation.py Wed Jan 24 22:04:57 2007 @@ -6,6 +6,7 @@ """ import py +from py.__.code import safe_repr class Presenter(object): """ Class used for presentation of various objects, @@ -84,7 +85,7 @@ else: # This formatting could all be handled by the _repr() function, which is # only repr.Repr in disguise, so is very configurable. - str_repr = py.__.code.safe_repr._repr(value) + str_repr = safe_repr._repr(value) if len(str_repr) < 70 or not isinstance(value, (list, tuple, dict)): self.out.line("%-10s = %s" %(name, str_repr)) From guido at codespeak.net Wed Jan 24 22:05:19 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 22:05:19 +0100 (CET) Subject: [py-svn] r37299 - py/trunk/py/apigen Message-ID: <20070124210519.8060810076@code0.codespeak.net> Author: guido Date: Wed Jan 24 22:05:18 2007 New Revision: 37299 Modified: py/trunk/py/apigen/htmlgen.py Log: Removed stupid space. Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Wed Jan 24 22:05:18 2007 @@ -539,7 +539,7 @@ def build_sig_value_description(self, name, _type): l = self.process_type_link(_type) items = [] - next = "%s : " % name + next = "%s: " % name for item in l: if isinstance(item, str): next += item From fijal at codespeak.net Wed Jan 24 22:05:34 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 24 Jan 2007 22:05:34 +0100 (CET) Subject: [py-svn] r37300 - in py/trunk/py/test: . rsession rsession/testing Message-ID: <20070124210534.E9B0710077@code0.codespeak.net> Author: fijal Date: Wed Jan 24 22:05:33 2007 New Revision: 37300 Modified: py/trunk/py/test/config.py py/trunk/py/test/rsession/rsession.py py/trunk/py/test/rsession/testing/test_rsession.py Log: Make clean complaints about lack of disthosts and call fixoptions if present. Modified: py/trunk/py/test/config.py ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py Wed Jan 24 22:05:33 2007 @@ -123,7 +123,9 @@ """ return an initialized session object. """ cls = self._getsessionclass() session = cls(self) - #session.fixoptions() + # XXX: all sessions should have one + if hasattr(session, 'fixoptions'): + session.fixoptions() return session def _getsessionclass(self): Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Wed Jan 24 22:05:33 2007 @@ -138,6 +138,22 @@ class RSession(AbstractSession): """ Remote version of session """ + def fixoptions(self): + config = self.config + try: + config.getvalue('disthosts') + except KeyError: + print "You're trying to run RSession without disthosts specified" + print "you need to specify it in your conftest.py (ie. ~/conftest.py)" + print "for example:" + print " disthosts = ['localhost'] * 4 # for 3 processors" + print " - or -" + print " disthosts = ['you at some.remote.com'] # for remote testing" + print " # with your remote ssh account" + print "http://codespeak.net/py/current/doc/test.html#automated-distributed-testing" + print " for more info..." + raise SystemExit + def main(self, reporter=None): """ main loop for running tests. """ args = self.config.args Modified: py/trunk/py/test/rsession/testing/test_rsession.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_rsession.py (original) +++ py/trunk/py/test/rsession/testing/test_rsession.py Wed Jan 24 22:05:33 2007 @@ -322,3 +322,8 @@ assert events[3].host.hostname == 'h2' assert events[3].host.relpath == 'home-h2' +def test_rsession_no_disthost(): + tmpdir = py.test.ensuretemp("rsession_no_disthost") + tmpdir.ensure("conftest.py") + config = py.test.config._reparse([str(tmpdir), '-d']) + py.test.raises(SystemExit, "config.initsession()") From fijal at codespeak.net Wed Jan 24 22:10:02 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 24 Jan 2007 22:10:02 +0100 (CET) Subject: [py-svn] r37301 - py/trunk/py/doc Message-ID: <20070124211002.B4E5A1006E@code0.codespeak.net> Author: fijal Date: Wed Jan 24 22:10:01 2007 New Revision: 37301 Modified: py/trunk/py/doc/test.txt Log: No longer that way (somebody should read that document once again) Modified: py/trunk/py/doc/test.txt ============================================================================== --- py/trunk/py/doc/test.txt (original) +++ py/trunk/py/doc/test.txt Wed Jan 24 22:10:01 2007 @@ -657,7 +657,7 @@ Hot to use it ----------------------- -When you issue ``py.test --session=R`` then your computer becomes +When you issue ``py.test -d`` then your computer becomes the distributor of tests ("master") and will start collecting and distributing tests to several machines. The machines need to be specified in a ``conftest.py`` file. From hpk at codespeak.net Wed Jan 24 22:11:25 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 24 Jan 2007 22:11:25 +0100 (CET) Subject: [py-svn] r37302 - py/trunk/py/test Message-ID: <20070124211125.C52261006E@code0.codespeak.net> Author: hpk Date: Wed Jan 24 22:11:24 2007 New Revision: 37302 Modified: py/trunk/py/test/collect.py py/trunk/py/test/item.py Log: experimentally enable FD-based output capturing per-test Modified: py/trunk/py/test/collect.py ============================================================================== --- py/trunk/py/test/collect.py (original) +++ py/trunk/py/test/collect.py Wed Jan 24 22:11:24 2007 @@ -374,11 +374,11 @@ def startcapture(self): if not self.config.option.nocapture: assert not hasattr(self, '_capture') - #self._capture = py.io.OutErrCapture() + self._capture = py.io.OutErrCapture() # XXX integrate this into py.io / refactor # execnet/py.test capturing mechanisms - from py.__.misc.simplecapture import SimpleOutErrCapture - self._capture = SimpleOutErrCapture() + #from py.__.misc.simplecapture import SimpleOutErrCapture + #self._capture = SimpleOutErrCapture() def finishcapture(self): if hasattr(self, '_capture'): Modified: py/trunk/py/test/item.py ============================================================================== --- py/trunk/py/test/item.py (original) +++ py/trunk/py/test/item.py Wed Jan 24 22:11:24 2007 @@ -33,9 +33,9 @@ def startcapture(self): if not self.config.option.nocapture: # XXX refactor integrate capturing - #self._capture = py.io.OutErrCapture() - from py.__.misc.simplecapture import SimpleOutErrCapture - self._capture = SimpleOutErrCapture() + self._capture = py.io.OutErrCapture() + #from py.__.misc.simplecapture import SimpleOutErrCapture + #self._capture = SimpleOutErrCapture() def finishcapture(self): if hasattr(self, '_capture'): From guido at codespeak.net Wed Jan 24 22:16:33 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 22:16:33 +0100 (CET) Subject: [py-svn] r37303 - py/trunk/py/apigen/testing Message-ID: <20070124211633.391711006E@code0.codespeak.net> Author: guido Date: Wed Jan 24 22:16:32 2007 New Revision: 37303 Modified: py/trunk/py/apigen/testing/test_apigen_functional.py Log: Made functional test use an absolute path to py.test. Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Wed Jan 24 22:16:32 2007 @@ -73,12 +73,13 @@ def test_apigen_functional(): fs_root, package_name = setup_fs_project() tempdir = py.test.ensuretemp('test_apigen_functional_results') - parentdir = py.magic.autopath().dirpath().dirpath() + pydir = py.magic.autopath().dirpath().dirpath().dirpath() pkgdir = fs_root.join('pkg') try: - output = py.process.cmdexec('APIGEN_TARGET="%s" py.test ' + output = py.process.cmdexec('APIGEN_TARGET="%s" %s/bin/py.test ' '--apigen="%s/apigen.py" "%s"' % ( - tempdir, parentdir, pkgdir)) + tempdir, pydir, pydir.join('apigen'), + pkgdir)) except py.error.Error, e: print e.out raise From guido at codespeak.net Wed Jan 24 22:58:26 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 22:58:26 +0100 (CET) Subject: [py-svn] r37305 - in py/trunk/py/apigen: . testing Message-ID: <20070124215826.82C661006E@code0.codespeak.net> Author: guido Date: Wed Jan 24 22:58:21 2007 New Revision: 37305 Added: py/trunk/py/apigen/api.js Modified: py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/layout.py py/trunk/py/apigen/style.css py/trunk/py/apigen/testing/test_apigen_example.py Log: Added some JavaScript to show and hide function information (source and such). Added: py/trunk/py/apigen/api.js ============================================================================== --- (empty file) +++ py/trunk/py/apigen/api.js Wed Jan 24 22:58:21 2007 @@ -0,0 +1,7 @@ +function showhideel(el) { + if (el.style.display == 'none') { + el.style.display = 'block'; + } else { + el.style.display = 'none'; + }; +}; Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Wed Jan 24 22:58:21 2007 @@ -130,13 +130,16 @@ ret[ns].append(itempath) return ret -def wrap_page(project, title, contentel, navel, outputpath, stylesheeturl): +def wrap_page(project, title, contentel, navel, outputpath, stylesheeturl, + scripturls): page = LayoutPage(project, title, nav=navel, encoding='UTF-8', - stylesheeturl=stylesheeturl) + stylesheeturl=stylesheeturl, scripturls=scripturls) page.set_content(contentel) here = py.magic.autopath().dirpath() style = here.join('style.css').read() outputpath.join('style.css').write(style) + apijs = here.join('api.js').read() + outputpath.join('api.js').write(apijs) return page # the PageBuilder classes take care of producing the docs (using the stuff @@ -146,8 +149,10 @@ targetpath = self.base.join(reltargetpath) stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), self.base.join('style.css').strpath) + scripturls = [relpath('%s/' % (targetpath.dirpath(),), + self.base.join('api.js').strpath)] page = wrap_page(project, title, - tag, nav, self.base, stylesheeturl) + tag, nav, self.base, stylesheeturl, scripturls) content = self.linker.call_withbase(reltargetpath, page.unicode) targetpath.ensure() targetpath.write(content.encode("utf8")) @@ -315,9 +320,11 @@ snippet = H.FunctionDescription( H.FunctionDef(localname, argdesc), - valuedesc, H.Docstring(docstring or H.em('no docstring available')), - csource, + H.div(H.a('show/hide info', + onclick='showhideel(this.parentNode.lastChild);'), + H.div(valuedesc, csource, style='display: none', + class_='funcinfo')), ) return snippet @@ -532,7 +539,7 @@ valuedesc.append(self.build_sig_value_description(name, _type)) if retval: retval = self.process_type_link(retval) - ret = H.div(H.div('where:'), valuedesc, H.div('return value:'), + ret = H.div(H.div('arguments:'), valuedesc, H.div('return value:'), retval or 'None') return ret Modified: py/trunk/py/apigen/layout.py ============================================================================== --- py/trunk/py/apigen/layout.py (original) +++ py/trunk/py/apigen/layout.py Wed Jan 24 22:58:21 2007 @@ -11,6 +11,7 @@ def __init__(self, *args, **kwargs): self.nav = kwargs.pop('nav') + self.scripturls = kwargs.pop('scripturls', []) super(LayoutPage, self).__init__(*args, **kwargs) def set_content(self, contentel): @@ -20,4 +21,7 @@ super(LayoutPage, self).fill() self.menubar[:] = [] self.menubar.append(self.nav) + for scripturl in self.scripturls: + self.head.append(py.xml.html.script(type="text/javascript", + src=scripturl)) Modified: py/trunk/py/apigen/style.css ============================================================================== --- py/trunk/py/apigen/style.css (original) +++ py/trunk/py/apigen/style.css Wed Jan 24 22:58:21 2007 @@ -63,43 +63,49 @@ } .code a { - color: blue; - font-weight: bold; - text-decoration: none; + color: blue; + font-weight: bold; + text-decoration: none; } a:hover { - color: #005; + color: #005; } - + .lineno { - text-align: right; - color: #555; - width: 3em; - padding-right: 1em; - border: 0px solid black; - border-right-width: 1px; + text-align: right; + color: #555; + width: 3em; + padding-right: 1em; + border: 0px solid black; + border-right-width: 1px; } .code { - padding-left: 1em; - white-space: pre; - font-family: monospace, Monaco; + padding-left: 1em; + white-space: pre; + font-family: monospace, Monaco; } .comment { - color: purple; + color: purple; } .string { - color: #777; + color: #777; } .keyword { - color: blue; + color: blue; } .alt_keyword { - color: green; + color: green; +} + +.funcinfo { + border: 1px solid black; + color: black; + padding: 1em; } - + Modified: py/trunk/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_example.py (original) +++ py/trunk/py/apigen/testing/test_apigen_example.py Wed Jan 24 22:58:21 2007 @@ -200,6 +200,7 @@ print html run_string_sequence_test(html, [ 'href="../style.css"', + 'src="../api.js"', 'href="index.html">pkg', 'href="main.html">main', 'href="main.SomeClass.html">SomeClass', From guido at codespeak.net Wed Jan 24 23:09:35 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 24 Jan 2007 23:09:35 +0100 (CET) Subject: [py-svn] r37306 - py/trunk/py/apigen Message-ID: <20070124220935.0BA301006E@code0.codespeak.net> Author: guido Date: Wed Jan 24 23:09:34 2007 New Revision: 37306 Modified: py/trunk/py/apigen/htmlgen.py Log: Fixed link (now properly has an href). Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Wed Jan 24 23:09:34 2007 @@ -322,7 +322,9 @@ H.FunctionDef(localname, argdesc), H.Docstring(docstring or H.em('no docstring available')), H.div(H.a('show/hide info', - onclick='showhideel(this.parentNode.lastChild);'), + href='#', + onclick=('showhideel(this.parentNode.lastChild);' + 'return false;')), H.div(valuedesc, csource, style='display: none', class_='funcinfo')), ) From guido at codespeak.net Thu Jan 25 10:46:27 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 10:46:27 +0100 (CET) Subject: [py-svn] r37314 - py/trunk/py/io Message-ID: <20070125094627.3D33110064@code0.codespeak.net> Author: guido Date: Thu Jan 25 10:46:16 2007 New Revision: 37314 Modified: py/trunk/py/io/capture.py py/trunk/py/io/dupfile.py Log: Added docstring. Modified: py/trunk/py/io/capture.py ============================================================================== --- py/trunk/py/io/capture.py (original) +++ py/trunk/py/io/capture.py Thu Jan 25 10:46:16 2007 @@ -72,3 +72,4 @@ finally: out, err = so.reset() return res, out, err + Modified: py/trunk/py/io/dupfile.py ============================================================================== --- py/trunk/py/io/dupfile.py (original) +++ py/trunk/py/io/dupfile.py Thu Jan 25 10:46:16 2007 @@ -2,6 +2,14 @@ import os def dupfile(f, mode=None, buffering=0, raising=False): + """ return a new open file object that's a duplicate of f + + mode is duplicated if not given, buffering controls + buffer size (defaulting to no buffering) and raising + defines whether an exception is raised when an incompatible + file object is passed in (if raising is False, the file + object itself will be returned) + """ try: fd = f.fileno() except AttributeError: @@ -11,3 +19,4 @@ newfd = os.dup(fd) mode = mode and mode or f.mode return os.fdopen(newfd, mode, buffering) + From guido at codespeak.net Thu Jan 25 10:51:52 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 10:51:52 +0100 (CET) Subject: [py-svn] r37315 - py/trunk/py/misc/testing Message-ID: <20070125095152.999ED10064@code0.codespeak.net> Author: guido Date: Thu Jan 25 10:51:51 2007 New Revision: 37315 Modified: py/trunk/py/misc/testing/test_terminal.py Log: Skipping test on Windows (no fcntl), removing stuff from try/finally body\n(too much crap in there, obfuscates errors). Modified: py/trunk/py/misc/testing/test_terminal.py ============================================================================== --- py/trunk/py/misc/testing/test_terminal.py (original) +++ py/trunk/py/misc/testing/test_terminal.py Thu Jan 25 10:51:51 2007 @@ -1,5 +1,6 @@ import os +import py from py.__.misc.terminal_helper import get_terminal_width def test_terminal_width(): @@ -7,11 +8,14 @@ """ assert get_terminal_width() try: - def f(*args): - raise ValueError import fcntl - ioctl = fcntl.ioctl - fcntl.ioctl = f + except ImportError: + py.test.skip('fcntl not supported on this platform') + def f(*args): + raise ValueError + ioctl = fcntl.ioctl + fcntl.ioctl = f + try: cols = os.environ.get('COLUMNS', None) os.environ['COLUMNS'] = '42' assert get_terminal_width() == 41 From guido at codespeak.net Thu Jan 25 11:16:38 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 11:16:38 +0100 (CET) Subject: [py-svn] r37317 - py/trunk/py/execnet Message-ID: <20070125101638.1AC9E10061@code0.codespeak.net> Author: guido Date: Thu Jan 25 11:16:35 2007 New Revision: 37317 Modified: py/trunk/py/execnet/register.py Log: Fixed execnet tests on Windows, for some reason it uses '0.0.0.0' as IP address if '' is given as hostname Modified: py/trunk/py/execnet/register.py ============================================================================== --- py/trunk/py/execnet/register.py (original) +++ py/trunk/py/execnet/register.py Thu Jan 25 11:16:35 2007 @@ -145,7 +145,9 @@ given gateway. """ if hostport is None: - host, port = ('', 0) + # XXX not sure about this one... is this what's intended? it used + # to use '' for the hostname, which breaks Windows... + host, port = ('127.0.0.1', 0) else: host, port = hostport socketserverbootstrap = py.code.Source( @@ -160,8 +162,10 @@ # execute the above socketserverbootstrap on the other side channel = gateway.remote_exec(socketserverbootstrap) hostname, (realhost, realport) = channel.receive() - if not hostname: - realhost = hostname + if not hostname: + # XXX this is strange... shouldn't it be 'realhost = hostname' or + # something? + hostname = realhost #gateway._trace("remote_install received" # "port=%r, hostname = %r" %(realport, hostname)) return py.execnet.SocketGateway(realhost, realport) From guido at codespeak.net Thu Jan 25 11:25:41 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 11:25:41 +0100 (CET) Subject: [py-svn] r37318 - py/trunk/py/execnet Message-ID: <20070125102541.41A1D10061@code0.codespeak.net> Author: guido Date: Thu Jan 25 11:25:40 2007 New Revision: 37318 Modified: py/trunk/py/execnet/register.py Log: Rolling back previous change, instead applying what seems to have been the intention from the start: if '' is supplied as hostname from the server, use the IP address as reported by socket.getsockname() Modified: py/trunk/py/execnet/register.py ============================================================================== --- py/trunk/py/execnet/register.py (original) +++ py/trunk/py/execnet/register.py Thu Jan 25 11:25:40 2007 @@ -145,9 +145,7 @@ given gateway. """ if hostport is None: - # XXX not sure about this one... is this what's intended? it used - # to use '' for the hostname, which breaks Windows... - host, port = ('127.0.0.1', 0) + host, port = ('', 0) else: host, port = hostport socketserverbootstrap = py.code.Source( @@ -163,12 +161,10 @@ channel = gateway.remote_exec(socketserverbootstrap) hostname, (realhost, realport) = channel.receive() if not hostname: - # XXX this is strange... shouldn't it be 'realhost = hostname' or - # something? hostname = realhost #gateway._trace("remote_install received" # "port=%r, hostname = %r" %(realport, hostname)) - return py.execnet.SocketGateway(realhost, realport) + return py.execnet.SocketGateway(hostname, realport) remote_install = classmethod(remote_install) class SshGateway(PopenCmdGateway): From guido at codespeak.net Thu Jan 25 12:59:05 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 12:59:05 +0100 (CET) Subject: [py-svn] r37322 - py/trunk/py/apigen/tracer Message-ID: <20070125115905.955D710071@code0.codespeak.net> Author: guido Date: Thu Jan 25 12:59:02 2007 New Revision: 37322 Modified: py/trunk/py/apigen/tracer/description.py Log: Turned out there was a function for this already, even... Thanks, fijal! Modified: py/trunk/py/apigen/tracer/description.py ============================================================================== --- py/trunk/py/apigen/tracer/description.py (original) +++ py/trunk/py/apigen/tracer/description.py Thu Jan 25 12:59:02 2007 @@ -1,6 +1,7 @@ import py from py.__.apigen.tracer import model +from py.__.code.source import getsource import types import inspect @@ -18,20 +19,7 @@ self.filename = frame.code.raw.co_filename self.lineno = frame.lineno self.firstlineno = frame.code.firstlineno - - fname = frame.code.raw.co_filename - if fname == '': - self.source = '' - elif hasattr(fname, '__source__'): - # is a py.code.Source object - self.source = str(fname.__source__) - # XXX should we do this? - # self.filename = fname.split('<')[1].split('>')[0] - else: - try: - self.source = frame.code.source() - except IOError: - raise IOError(self.filename) + self.source = getsource(frame.code.raw) def _getval(self): return (self.filename, self.lineno) From guido at codespeak.net Thu Jan 25 13:54:53 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 13:54:53 +0100 (CET) Subject: [py-svn] r37325 - in py/trunk/py/apigen: . testing Message-ID: <20070125125453.1298D10063@code0.codespeak.net> Author: guido Date: Thu Jan 25 13:54:51 2007 New Revision: 37325 Modified: py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/linker.py py/trunk/py/apigen/testing/test_apigen_functional.py py/trunk/py/apigen/testing/test_linker.py Log: Fixed problems with windows path seperators, fixed functional test exec command for win32 Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Thu Jan 25 13:54:51 2007 @@ -1,4 +1,5 @@ import py +import os import inspect from py.__.apigen.layout import LayoutPage from py.__.apigen.source import browser as source_browser @@ -167,11 +168,11 @@ def build_navigation(self, fspath): nav = H.Navigation() relpath = fspath.relto(self.projroot) - path = relpath.split('/') + path = relpath.split(os.path.sep) indent = 0 # build links to parents for i in xrange(len(path)): - dirpath = '/'.join(path[:i]) + dirpath = os.path.sep.join(path[:i]) abspath = self.projroot.join(dirpath).strpath if i == 0: text = 'root' @@ -244,15 +245,17 @@ if fspath.ext in ['.pyc', '.pyo']: continue relfspath = fspath.relto(base) - if relfspath.find('/.') > -1: + if relfspath.find('%s.' % (os.path.sep,)) > -1: # skip hidden dirs and files continue elif fspath.check(dir=True): if relfspath != '': - relfspath += '/' - reloutputpath = 'source/%sindex.html' % (relfspath,) + relfspath += os.path.sep + reloutputpath = 'source%s%sindex.html' % (os.path.sep, + relfspath) else: - reloutputpath = "source/%s.html" % (relfspath,) + reloutputpath = "source%s%s.html" % (os.path.sep, relfspath) + reloutputpath = reloutputpath.replace(os.path.sep, '/') outputpath = self.base.join(reloutputpath) self.linker.set_link(str(fspath), reloutputpath) passed.append((fspath, outputpath)) @@ -279,7 +282,7 @@ else: tag, nav = self.build_nonpython_page(fspath) title = 'sources for %s' % (fspath.basename,) - reltargetpath = outputpath.relto(self.base) + reltargetpath = outputpath.relto(self.base).replace(os.path.sep, '/') self.write_page(title, reltargetpath, project, tag, nav) class ApiPageBuilder(AbstractPageBuilder): Modified: py/trunk/py/apigen/linker.py ============================================================================== --- py/trunk/py/apigen/linker.py (original) +++ py/trunk/py/apigen/linker.py Thu Jan 25 13:54:51 2007 @@ -1,4 +1,5 @@ import py +import os html = py.xml.html def getrelfspath(dotted_name): @@ -41,7 +42,27 @@ finally: del self.fromlocation -def relpath(p1, p2, sep='/', back='..'): +def relpath(p1, p2, sep='/', back='..', normalize=True): + """ create a relative path from p1 to p2 + + sep is the seperator used, set to '\\' on windows (but only + when not using 'normalize'! see below) + + back is the string used to indicate the parent directory + + when 'normalize' is True, any backslashes (\) in the path + will be replaced with forward slashes, resulting in a consistent + output on Windows and the rest of the world (this happens before + the 'sep' argument is used, and therefore renders that useless!) + + paths to directories must end on a / (URL style) + """ + if normalize: + sep = '/' + p1 = p1.replace(os.path.sep, '/') + p2 = p2.replace(os.path.sep, '/') + # XXX would be cool to be able to do long filename expansion and drive + # letter fixes here, and such... iow: windows sucks :( if (p1.startswith(sep) ^ p2.startswith(sep)): raise ValueError("mixed absolute relative path: %r -> %r" %(p1, p2)) fromlist = p1.split(sep) Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Thu Jan 25 13:54:51 2007 @@ -75,10 +75,14 @@ tempdir = py.test.ensuretemp('test_apigen_functional_results') pydir = py.magic.autopath().dirpath().dirpath().dirpath() pkgdir = fs_root.join('pkg') + if py.std.sys.platform == 'win32': + cmd = 'set APIGEN_TARGET=%s && python "%s/bin/py.test"' % (tempdir, + pydir) + else: + cmd = 'APIGEN_TARGET="%s" "%s/bin/py.test"' % (tempdir, pydir) try: - output = py.process.cmdexec('APIGEN_TARGET="%s" %s/bin/py.test ' - '--apigen="%s/apigen.py" "%s"' % ( - tempdir, pydir, pydir.join('apigen'), + output = py.process.cmdexec('%s --apigen="%s/apigen.py" "%s"' % ( + cmd, pydir.join('apigen'), pkgdir)) except py.error.Error, e: print e.out Modified: py/trunk/py/apigen/testing/test_linker.py ============================================================================== --- py/trunk/py/apigen/testing/test_linker.py (original) +++ py/trunk/py/apigen/testing/test_linker.py Thu Jan 25 13:54:51 2007 @@ -17,8 +17,6 @@ linker.get_target, 'py.path.local') assert relpath == 'path/local.html' - - testspec = [ 'a a/b a/b', '/a /a/b a/b', @@ -28,17 +26,17 @@ '/a/b /c/d ../c/d', 'a/b a ../a', '/a/b /a ../a', -] + 'c:\\foo\\bar c:\\foo ../foo', +] def gen_check(frompath, topath, expected): result = relpath(frompath, topath) - print "linking", frompath, "to", topath assert result == expected def test_gen_check(): for line in testspec: frompath, topath, expected = line.split() - yield gen_check, frompath, topath, expected + yield gen_check, frompath, topath, expected, def test_check_incompatible(): py.test.raises(ValueError, "relpath('/a', 'b')") From guido at codespeak.net Thu Jan 25 13:56:14 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 13:56:14 +0100 (CET) Subject: [py-svn] r37326 - py/trunk/py/test/testing Message-ID: <20070125125614.089C310063@code0.codespeak.net> Author: guido Date: Thu Jan 25 13:56:12 2007 New Revision: 37326 Modified: py/trunk/py/test/testing/test_config.py Log: Fixed exec command on win32 Modified: py/trunk/py/test/testing/test_config.py ============================================================================== --- py/trunk/py/test/testing/test_config.py (original) +++ py/trunk/py/test/testing/test_config.py Thu Jan 25 13:56:12 2007 @@ -87,9 +87,11 @@ assert cfg.getvalue(path=o.join('sister1'), name='x') == 2 old = o.chdir() try: - print py.process.cmdexec("py.test sister1") + pytestpath = py.magic.autopath().dirpath().dirpath().dirpath().join( + 'bin/py.test') + print py.process.cmdexec('python "%s" sister1' % (pytestpath,)) o.join('sister1').chdir() - print py.process.cmdexec("py.test") + print py.process.cmdexec('python "%s"' % (pytestpath,)) finally: old.chdir() From guido at codespeak.net Thu Jan 25 14:22:08 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 14:22:08 +0100 (CET) Subject: [py-svn] r37328 - in py/trunk/py/apigen: . testing Message-ID: <20070125132208.4774E10071@code0.codespeak.net> Author: guido Date: Thu Jan 25 14:22:04 2007 New Revision: 37328 Modified: py/trunk/py/apigen/linker.py py/trunk/py/apigen/testing/test_linker.py Log: Fixed problem with Windows paths in tests when running on Linux (and fixed relpath() api to deal with line seps in a better way). Modified: py/trunk/py/apigen/linker.py ============================================================================== --- py/trunk/py/apigen/linker.py (original) +++ py/trunk/py/apigen/linker.py Thu Jan 25 14:22:04 2007 @@ -45,22 +45,21 @@ def relpath(p1, p2, sep='/', back='..', normalize=True): """ create a relative path from p1 to p2 - sep is the seperator used, set to '\\' on windows (but only - when not using 'normalize'! see below) + sep is the seperator used for input and (depending + on the setting of 'normalize', see below) output back is the string used to indicate the parent directory when 'normalize' is True, any backslashes (\) in the path will be replaced with forward slashes, resulting in a consistent - output on Windows and the rest of the world (this happens before - the 'sep' argument is used, and therefore renders that useless!) + output on Windows and the rest of the world paths to directories must end on a / (URL style) """ if normalize: + p1 = p1.replace(sep, '/') + p2 = p2.replace(sep, '/') sep = '/' - p1 = p1.replace(os.path.sep, '/') - p2 = p2.replace(os.path.sep, '/') # XXX would be cool to be able to do long filename expansion and drive # letter fixes here, and such... iow: windows sucks :( if (p1.startswith(sep) ^ p2.startswith(sep)): Modified: py/trunk/py/apigen/testing/test_linker.py ============================================================================== --- py/trunk/py/apigen/testing/test_linker.py (original) +++ py/trunk/py/apigen/testing/test_linker.py Thu Jan 25 14:22:04 2007 @@ -18,25 +18,25 @@ assert relpath == 'path/local.html' testspec = [ - 'a a/b a/b', - '/a /a/b a/b', - 'a b b', - '/a /b b', - 'a/b c/d ../c/d', - '/a/b /c/d ../c/d', - 'a/b a ../a', - '/a/b /a ../a', - 'c:\\foo\\bar c:\\foo ../foo', + 'a a/b a/b /', + '/a /a/b a/b /', + 'a b b /', + '/a /b b /', + 'a/b c/d ../c/d /', + '/a/b /c/d ../c/d /', + 'a/b a ../a /', + '/a/b /a ../a /', + 'c:\\foo\\bar c:\\foo ../foo \\', ] -def gen_check(frompath, topath, expected): - result = relpath(frompath, topath) +def gen_check(frompath, topath, sep, expected): + result = relpath(frompath, topath, sep=sep) assert result == expected def test_gen_check(): for line in testspec: - frompath, topath, expected = line.split() - yield gen_check, frompath, topath, expected, + frompath, topath, expected, sep = line.split() + yield gen_check, frompath, topath, sep, expected def test_check_incompatible(): py.test.raises(ValueError, "relpath('/a', 'b')") From guido at codespeak.net Thu Jan 25 15:08:50 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 15:08:50 +0100 (CET) Subject: [py-svn] r37330 - py/trunk/py/doc Message-ID: <20070125140850.AD45910063@code0.codespeak.net> Author: guido Date: Thu Jan 25 15:08:48 2007 New Revision: 37330 Modified: py/trunk/py/doc/conftest.py py/trunk/py/doc/test_conftest.py Log: Replacing any non-Unix newlines with plain \n in doctests, this fixes some win32 problem. Modified: py/trunk/py/doc/conftest.py ============================================================================== --- py/trunk/py/doc/conftest.py (original) +++ py/trunk/py/doc/conftest.py Thu Jan 25 15:08:48 2007 @@ -62,18 +62,20 @@ class DoctestText(py.test.Item): def run(self): - s = self.fspath.read() + # XXX quite nasty... but it works (fixes win32 issues) + s = self._normalize_linesep() l = [] prefix = '.. >>> ' mod = py.std.types.ModuleType(self.fspath.purebasename) - for line in s.split('\n'): - if line.startswith(prefix): - exec py.code.Source(line[len(prefix):]).compile() in mod.__dict__ + for line in s.split('\n'): + if line.startswith(prefix): + exec py.code.Source(line[len(prefix):]).compile() in \ + mod.__dict__ line = "" - else: + else: l.append(line) - docstring = "\n".join(l) - self.execute(mod, docstring) + docstring = "\n".join(l) + self.execute(mod, docstring) def execute(self, mod, docstring): mod.__doc__ = docstring @@ -81,6 +83,20 @@ if failed: py.test.fail("doctest %s: %s failed out of %s" %( self.fspath, failed, tot)) + + def _normalize_linesep(self): + s = self.fspath.read() + linesep = '\n' + if '\r' in s: + if '\n' not in s: + linesep = '\r' + else: + linesep = '\r\n' + print 'linesep:', repr(linesep) + s = s.replace(linesep, '\n') + self.fspath.write(s) + print 's:', repr(s) + return s class LinkCheckerMaker(py.test.collect.Collector): def run(self): Modified: py/trunk/py/doc/test_conftest.py ============================================================================== --- py/trunk/py/doc/test_conftest.py (original) +++ py/trunk/py/doc/test_conftest.py Thu Jan 25 15:08:48 2007 @@ -36,6 +36,21 @@ l2 = session.getitemoutcomepairs(py.test.Item.Skipped) assert len(l+l2) == 2 +def test_doctest_eol(): + # XXX get rid of the next line: + py.magic.autopath().dirpath('conftest.py').copy(tmpdir.join('conftest.py')) + + ytxt = tmpdir.join('y.txt') + ytxt.write(py.code.Source(".. >>> 1 + 1\r\n 2\r\n\r\n")) + config = py.test.config._reparse([ytxt]) + session = config.initsession() + session.main() + l = session.getitemoutcomepairs(py.test.Item.Failed) + assert len(l) == 0 + l = session.getitemoutcomepairs(py.test.Item.Passed) + l2 = session.getitemoutcomepairs(py.test.Item.Skipped) + assert len(l+l2) == 2 + def test_js_ignore(): py.magic.autopath().dirpath('conftest.py').copy(tmpdir.join('conftest.py')) tmpdir.ensure('__init__.py') From guido at codespeak.net Thu Jan 25 16:23:19 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 16:23:19 +0100 (CET) Subject: [py-svn] r37337 - py/trunk/py/test/rsession Message-ID: <20070125152319.3A99F1007B@code0.codespeak.net> Author: guido Date: Thu Jan 25 16:23:18 2007 New Revision: 37337 Modified: py/trunk/py/test/rsession/rsession.py Log: Replaced try/except with a hasattr (makes that unrelated errors are no longer obfuscated). Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Thu Jan 25 16:23:18 2007 @@ -270,20 +270,13 @@ if self.config.option.apigen: from py.__.apigen.tracer.docstorage import DocStorageAccessor apigen = py.path.local(self.config.option.apigen).pyimport() + if not hasattr(apigen, 'build'): + raise NotImplementedError("Provided script does not seem " + "to contain build function") print >>sys.stderr, 'building documentation' capture = py.io.OutErrCapture() try: - try: - apigen.build(pkgdir, DocStorageAccessor(self.docstorage)) - except (ValueError, AttributeError): - #import traceback - #exc, e, tb = sys.exc_info() - #print '%s - %s' % (exc, e) - #print ''.join(traceback.format_tb(tb)) - #del tb - #print '-' * 79 - raise NotImplementedError("Provided script does not seem " - "to contain build function") + apigen.build(pkgdir, DocStorageAccessor(self.docstorage)) finally: capture.reset() From fijal at codespeak.net Thu Jan 25 17:46:58 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 25 Jan 2007 17:46:58 +0100 (CET) Subject: [py-svn] r37343 - py/trunk/py/apigen Message-ID: <20070125164658.878A610077@code0.codespeak.net> Author: fijal Date: Thu Jan 25 17:46:56 2007 New Revision: 37343 Modified: py/trunk/py/apigen/apigen.py Log: Hours later and tons of debug print changes.... I HATE PYTHON IMPORTS, I HATE PYTHON IMPORTS, I HATE PYTHON IMPORTS Modified: py/trunk/py/apigen/apigen.py ============================================================================== --- py/trunk/py/apigen/apigen.py (original) +++ py/trunk/py/apigen/apigen.py Thu Jan 25 17:46:56 2007 @@ -6,19 +6,15 @@ import os import py +import sys from py.__.apigen import htmlgen from py.__.apigen import linker from py.__.apigen import project -def import_pkgdir(pkgdir): - if pkgdir.check(dir=True): - return pkgdir.join('__init__.py').getpymodule() - else: - # XXX not sure if this is ever used normally... - return pkgdir.getpymodule() - def get_documentable_items(pkgdir): - rootmod = import_pkgdir(pkgdir) + sys.path.insert(0, str(pkgdir.dirpath())) + rootmod = __import__(pkgdir.basename) + #rootmod = import_pkgdir(pkgdir) if hasattr(rootmod, '__package__'): return rootmod # XXX fix non-initpkg situations(?) From fijal at codespeak.net Thu Jan 25 18:02:04 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 25 Jan 2007 18:02:04 +0100 (CET) Subject: [py-svn] r37345 - py/trunk/py/test/terminal Message-ID: <20070125170204.2F62C1007A@code0.codespeak.net> Author: fijal Date: Thu Jan 25 18:02:01 2007 New Revision: 37345 Modified: py/trunk/py/test/terminal/terminal.py Log: Remove unneeded import Modified: py/trunk/py/test/terminal/terminal.py ============================================================================== --- py/trunk/py/test/terminal/terminal.py (original) +++ py/trunk/py/test/terminal/terminal.py Thu Jan 25 18:02:01 2007 @@ -3,7 +3,6 @@ from time import time as now Item = py.test.Item from py.__.test.terminal.out import getout -import py.__.code.safe_repr from py.__.test.representation import Presenter def getrelpath(source, dest): From fijal at codespeak.net Thu Jan 25 18:02:33 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 25 Jan 2007 18:02:33 +0100 (CET) Subject: [py-svn] r37346 - py/trunk/py/code Message-ID: <20070125170233.CC61B1007D@code0.codespeak.net> Author: fijal Date: Thu Jan 25 18:02:32 2007 New Revision: 37346 Modified: py/trunk/py/code/code.py Log: Add __ne__ Modified: py/trunk/py/code/code.py ============================================================================== --- py/trunk/py/code/code.py (original) +++ py/trunk/py/code/code.py Thu Jan 25 18:02:32 2007 @@ -13,7 +13,10 @@ self.name = rawcode.co_name def __eq__(self, other): - return self.raw == other.raw + return self.raw == other.raw + + def __ne__(self): + return not self == other def new(self, rec=False, **kwargs): """ return new code object with modified attributes. From fijal at codespeak.net Thu Jan 25 18:03:55 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 25 Jan 2007 18:03:55 +0100 (CET) Subject: [py-svn] r37347 - py/trunk/py/apigen/tracer/testing Message-ID: <20070125170355.A38AF1007B@code0.codespeak.net> Author: fijal Date: Thu Jan 25 18:03:54 2007 New Revision: 37347 Modified: py/trunk/py/apigen/tracer/testing/test_docgen.py Log: Enchance the test. Modified: py/trunk/py/apigen/tracer/testing/test_docgen.py ============================================================================== --- py/trunk/py/apigen/tracer/testing/test_docgen.py (original) +++ py/trunk/py/apigen/tracer/testing/test_docgen.py Thu Jan 25 18:03:54 2007 @@ -385,8 +385,8 @@ from someclass import SomeClass class SomeSubClass(SomeClass): " docstring somesubclass " - def get_somevar(self): - return self.somevar + 1 + #def get_somevar(self): + # return self.somevar + 1 """)) temp.ensure('pkg/somenamespace.py').write(py.code.Source("""\ from pkg.main.sub import func @@ -405,8 +405,7 @@ initpkg(__name__, exportdefs = { 'main.sub.func': ("./func.py", "func"), 'main.SomeClass': ('./someclass.py', 'SomeClass'), - 'main.SomeInstance': ('./someclass.py', 'SomeInstance'), - 'main.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), + #'main.SomeInstance': ('./someclass.py', 'SomeInstance'), 'main.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), 'other': ('./somenamespace.py', '*'), }) @@ -423,6 +422,22 @@ def test_get_initpkg_star_items(): pkg, ds = setup_pkg_docstorage() sit = ds.get_star_import_tree(pkg.other, 'pkg.other') - print sit assert sorted(sit.keys()) == ['pkg.other.baz', 'pkg.other.foo'] + t = Tracer(ds) + t.start_tracing() + pkg.main.sub.func("a1") + pkg.main.SomeClass(3).get_somevar() + pkg.main.SomeSubClass("xxx").get_somevar() + t.end_tracing() + assert isinstance(ds.descs['main.sub.func'].inputcells[0], model.SomeString) + desc = ds.descs['main.SomeClass'] + assert ds.descs['main.SomeClass.get_somevar'] is desc.fields['get_somevar'] + cell = desc.fields['get_somevar'].inputcells[0] + assert isinstance(cell, model.SomeInstance) + assert cell.classdef.cls is desc.pyobj + desc = ds.descs['main.SomeSubClass'] + assert ds.descs['main.SomeSubClass.get_somevar'] is desc.fields['get_somevar'] + cell = desc.fields['get_somevar'].inputcells[0] + assert isinstance(cell, model.SomeInstance) + assert cell.classdef.cls is desc.pyobj From fijal at codespeak.net Thu Jan 25 18:13:26 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 25 Jan 2007 18:13:26 +0100 (CET) Subject: [py-svn] r37348 - py/trunk/py/test/rsession Message-ID: <20070125171326.16EAF1007A@code0.codespeak.net> Author: fijal Date: Thu Jan 25 18:13:24 2007 New Revision: 37348 Modified: py/trunk/py/test/rsession/outcome.py Log: Fallback Modified: py/trunk/py/test/rsession/outcome.py ============================================================================== --- py/trunk/py/test/rsession/outcome.py (original) +++ py/trunk/py/test/rsession/outcome.py Thu Jan 25 18:13:24 2007 @@ -34,10 +34,13 @@ relline = lineno - tb_entry.frame.code.firstlineno path = str(tb_entry.path) #try: - if tb_style == 'long': - source = str(tb_entry.getsource()) - else: - source = str(tb_entry.getsource()).split("\n")[relline] + try: + if tb_style == 'long': + source = str(tb_entry.getsource()) + else: + source = str(tb_entry.getsource()).split("\n")[relline] + except py.error.ENOENT: + source = "[cannot get source]" name = tb_entry.frame.code.raw.co_name # XXX: Bare except. What can getsource() raise anyway? # SyntaxError, AttributeError, IndentationError for sure, check it From fijal at codespeak.net Thu Jan 25 20:59:20 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 25 Jan 2007 20:59:20 +0100 (CET) Subject: [py-svn] r37354 - py/trunk/py/test/rsession Message-ID: <20070125195920.22D0210075@code0.codespeak.net> Author: fijal Date: Thu Jan 25 20:59:17 2007 New Revision: 37354 Modified: py/trunk/py/test/rsession/local.py Log: Move tracing a bit down (performance, no change in behaviour) Modified: py/trunk/py/test/rsession/local.py ============================================================================== --- py/trunk/py/test/rsession/local.py (original) +++ py/trunk/py/test/rsession/local.py Thu Jan 25 20:59:17 2007 @@ -38,10 +38,15 @@ def apigen_runner(item, session, reporter): r = RunExecutor(item, reporter=reporter, config=session.config) + startcapture(session) + #retval = plain_runner(item, session, reporter) + r = RunExecutor(item, reporter=reporter, config=session.config) session.tracer.start_tracing() - retval = plain_runner(item, session, reporter) + outcome = r.execute() session.tracer.end_tracing() - return retval + outcome = ReprOutcome(outcome.make_repr(session.config.option.tbstyle)) + outcome.stdout, outcome.stderr = finishcapture(session) + return outcome def exec_runner(item, session, reporter): raise NotImplementedError() From guido at codespeak.net Thu Jan 25 21:39:45 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Thu, 25 Jan 2007 21:39:45 +0100 (CET) Subject: [py-svn] r37355 - py/trunk/py/apigen/tracer/testing Message-ID: <20070125203945.4F28910068@code0.codespeak.net> Author: guido Date: Thu Jan 25 21:39:43 2007 New Revision: 37355 Modified: py/trunk/py/apigen/tracer/testing/test_docgen.py Log: Fixing test (not sure why it was in this state?). Modified: py/trunk/py/apigen/tracer/testing/test_docgen.py ============================================================================== --- py/trunk/py/apigen/tracer/testing/test_docgen.py (original) +++ py/trunk/py/apigen/tracer/testing/test_docgen.py Thu Jan 25 21:39:43 2007 @@ -427,7 +427,7 @@ t.start_tracing() pkg.main.sub.func("a1") pkg.main.SomeClass(3).get_somevar() - pkg.main.SomeSubClass("xxx").get_somevar() + pkg.main.SomeSubClass(4).get_somevar() t.end_tracing() assert isinstance(ds.descs['main.sub.func'].inputcells[0], model.SomeString) desc = ds.descs['main.SomeClass'] From fijal at codespeak.net Fri Jan 26 12:50:03 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 26 Jan 2007 12:50:03 +0100 (CET) Subject: [py-svn] r37380 - in py/trunk/py/test/rsession: . testing Message-ID: <20070126115003.12F841008A@code0.codespeak.net> Author: fijal Date: Fri Jan 26 12:49:59 2007 New Revision: 37380 Modified: py/trunk/py/test/rsession/hostmanage.py py/trunk/py/test/rsession/master.py py/trunk/py/test/rsession/reporter.py py/trunk/py/test/rsession/rsession.py py/trunk/py/test/rsession/slave.py py/trunk/py/test/rsession/testing/test_master.py py/trunk/py/test/rsession/testing/test_rsession.py py/trunk/py/test/rsession/testing/test_slave.py Log: This is rather huge checkin of a rsession refactoring. Got rid of most of the pkgdir and changed to use get_collector_trail. Some tests need to be rewritten or killed, right now they're skips. There are no checks (yet) whether this works with topdir being something else than previous pkgdir, we'll see... Modified: py/trunk/py/test/rsession/hostmanage.py ============================================================================== --- py/trunk/py/test/rsession/hostmanage.py (original) +++ py/trunk/py/test/rsession/hostmanage.py Fri Jan 26 12:49:59 2007 @@ -74,15 +74,14 @@ self.create_gateways = create_gateways class HostManager(object): - def __init__(self, sshhosts, config, pkgdir, options=HostOptions()): + def __init__(self, sshhosts, config, options=HostOptions()): self.sshhosts = sshhosts - self.pkgdir = pkgdir self.config = config self.options = options if not options.create_gateways: self.prepare_gateways = self.prepare_dummy_gateways - assert pkgdir.join("__init__.py").check(), ( - "%s probably wrong" %(pkgdir,)) + #assert pkgdir.join("__init__.py").check(), ( + # "%s probably wrong" %(pkgdir,)) def prepare_dummy_gateways(self): for host in self.sshhosts: @@ -113,7 +112,7 @@ gw = py.execnet.PopenGateway() else: gw = py.execnet.PopenGateway(python=self.options.remote_python) - host.relpath = str(self.pkgdir.dirpath()) + host.relpath = str(self.config.topdir) return gw def prepare_gateways(self): @@ -159,15 +158,14 @@ rsync.add_target(host.gw, host.relpath, done) if not self.options.do_sync: return # for testing only - rsync.send(self.pkgdir.dirpath()) + rsync.send(self.config.topdir) # hosts ready return self.setup_nodes(reporter, done_dict) def setup_nodes(self, reporter, done_dict): nodes = [] for host in self.sshhosts: - ch = setup_slave(host.gw, os.path.join(host.relpath,\ - self.pkgdir.basename), self.config) + ch = setup_slave(host.gw, host.relpath, self.config) nodes.append(MasterNode(ch, reporter, done_dict)) return nodes Modified: py/trunk/py/test/rsession/master.py ============================================================================== --- py/trunk/py/test/rsession/master.py (original) +++ py/trunk/py/test/rsession/master.py Fri Jan 26 12:49:59 2007 @@ -29,8 +29,8 @@ self.channel.send(42) else: self.pending.insert(0, item) - itemspec = item.listnames()[1:] - self.channel.send(itemspec) + #itemspec = item.listnames()[1:] + self.channel.send(item.config.get_collector_trail(item)) # send start report self.reporter(report.SendItem(self.channel, item)) Modified: py/trunk/py/test/rsession/reporter.py ============================================================================== --- py/trunk/py/test/rsession/reporter.py (original) +++ py/trunk/py/test/rsession/reporter.py Fri Jan 26 12:49:59 2007 @@ -16,9 +16,8 @@ import sys class AbstractReporter(object): - def __init__(self, config, hosts, pkgdir=py.path.local(py.__file__)): + def __init__(self, config, hosts): self.config = config - self.pkgdir = pkgdir self.hosts = hosts self.failed_tests_outcome = [] self.skipped_tests_outcome = [] @@ -296,7 +295,7 @@ # print names relative to current workdir name = "/".join(item.listnames()) local = str(py.path.local()) - d = str(self.pkgdir.dirpath().dirpath()) + d = str(self.config.topdir) if local.startswith(d): local = local[len(d) + 1:] if local and name.startswith(local): Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Fri Jan 26 12:49:59 2007 @@ -26,23 +26,6 @@ self.config = config self.optimise_localhost = optimise_localhost - def make_colitems(paths, baseon): - # we presume that from the base we can simply get to - # the target paths by joining the basenames - res = [] - for x in paths: - x = py.path.local(x) - current = py.test.collect.Directory(baseon) - relparts = x.relto(baseon).split(x.sep) - assert relparts - for part in relparts: - next = current.join(part) - assert next is not None, (current, part) - current = next - res.append(current) - return res - make_colitems = staticmethod(make_colitems) - def getpkgdir(path): path = py.path.local(path) pkgpath = path.pypkgpath() @@ -80,7 +63,7 @@ from py.__.test.rsession.rest import RestReporter reporter_class = RestReporter if arg: - reporter_instance = reporter_class(self.config, sshhosts, self.getpkgdir(arg)) + reporter_instance = reporter_class(self.config, sshhosts) else: reporter_instance = reporter_class(self.config, sshhosts) reporter = reporter_instance.report @@ -165,17 +148,16 @@ reporter(report.TestStarted(sshhosts)) - pkgdir = self.getpkgdir(args[0]) done_dict = {} hostopts = HostOptions(rsync_roots=rsync_roots, remote_python=remotepython, optimise_localhost=self.optimise_localhost) - hostmanager = HostManager(sshhosts, self.config, pkgdir, hostopts) + hostmanager = HostManager(sshhosts, self.config, hostopts) try: nodes = hostmanager.init_hosts(reporter, done_dict) reporter(report.RsyncFinished()) try: - self.dispatch_tests(nodes, args, pkgdir, reporter, checkfun, done_dict) + self.dispatch_tests(nodes, reporter, checkfun, done_dict) except (KeyboardInterrupt, SystemExit): print >>sys.stderr, "C-c pressed waiting for gateways to teardown..." channels = [node.channel for node in nodes] @@ -213,8 +195,8 @@ remotepython = self.config.getvalue("dist_remotepython") return sshhosts, remotepython, rsync_roots - def dispatch_tests(self, nodes, args, pkgdir, reporter, checkfun, done_dict): - colitems = self.make_colitems(args, baseon=pkgdir.dirpath()) + def dispatch_tests(self, nodes, reporter, checkfun, done_dict): + colitems = self.config.getcolitems() keyword = self.config.option.keyword itemgenerator = itemgen(colitems, reporter, keyword, self.reporterror) @@ -246,7 +228,7 @@ reporter(report.TestStarted(sshhosts)) pkgdir = self.getpkgdir(args[0]) - colitems = self.make_colitems(args, baseon=pkgdir.dirpath()) + colitems = self.config.getcolitems() reporter(report.RsyncFinished()) if runner is None: @@ -276,7 +258,17 @@ print >>sys.stderr, 'building documentation' capture = py.io.OutErrCapture() try: - apigen.build(pkgdir, DocStorageAccessor(self.docstorage)) + try: + apigen.build(pkgdir, DocStorageAccessor(self.docstorage)) + except AttributeError: + import traceback + exc, e, tb = sys.exc_info() + print '%s - %s' % (exc, e) + print ''.join(traceback.format_tb(tb)) + del tb + print '-' * 79 + raise NotImplementedError("Provided script does not seem " + "to contain build function") finally: capture.reset() @@ -292,8 +284,20 @@ else: self.docstorage = DocStorage().from_pkg(items) except ImportError: + import traceback + exc, e, tb = sys.exc_info() + print '%s - %s' % (exc, e) + print ''.join(traceback.format_tb(tb)) + del tb + print '-' * 79 raise ImportError("Provided script cannot be imported") except (ValueError, AttributeError): + import traceback + exc, e, tb = sys.exc_info() + print '%s - %s' % (exc, e) + print ''.join(traceback.format_tb(tb)) + del tb + print '-' * 79 raise NotImplementedError("Provided script does not seem " "to contain get_documentable_items") self.tracer = Tracer(self.docstorage) Modified: py/trunk/py/test/rsession/slave.py ============================================================================== --- py/trunk/py/test/rsession/slave.py (original) +++ py/trunk/py/test/rsession/slave.py Fri Jan 26 12:49:59 2007 @@ -45,14 +45,15 @@ self.lock.release() class SlaveNode(object): - def __init__(self, rootcollector, config, pidinfo, executor=AsyncExecutor): - self.rootcollector = rootcollector + def __init__(self, config, pidinfo, executor=AsyncExecutor): + #self.rootcollector = rootcollector self.config = config self.executor = executor self.pidinfo = pidinfo def execute(self, itemspec): - item = self.rootcollector.getitembynames(itemspec) + #item = self.rootcollector.getitembynames(itemspec) + item = self.config._getcollector(itemspec) #if isinstance(item, py.test.Function): # ex = Executor(item.obj, setup=item.setup) #else: @@ -84,7 +85,7 @@ if node is not None: return node col = py.test.collect.Directory(str(py.path.local(path).join(item[0]))) - node = nodes[item[0]] = SlaveNode(col, config, pidinfo) + node = nodes[item[0]] = SlaveNode(config, pidinfo) return node while 1: nextitem = receive() @@ -92,7 +93,7 @@ break try: node = getnode(nextitem) - res = node.run(nextitem[1:]) + res = node.run(nextitem) except py.test.Item.Skipped, s: send(Outcome(skipped=str(s)).make_repr()) except: @@ -120,10 +121,8 @@ return callback import os, sys - pkgdir = channel.receive() # path is ready - config_repr = channel.receive() - basedir = os.path.dirname(pkgdir) - pkgname = os.path.basename(pkgdir) + basedir = channel.receive() # path is ready + config_repr = channel.receive() # setup defaults... sys.path.insert(0, basedir) import py @@ -133,11 +132,8 @@ config.merge_repr(config_repr) else: config.initdirect(basedir, config_repr) - #config.conftest.lget('adddefaultoptions')() if not config.option.nomagic: py.magic.invoke(assertion=1) - mod = __import__(pkgname) - assert py.path.local(mod.__file__).dirpath() == py.path.local(pkgdir) from py.__.test.rsession.slave import slave_main, PidInfo queue = py.std.Queue.Queue() pidinfo = PidInfo() Modified: py/trunk/py/test/rsession/testing/test_master.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_master.py (original) +++ py/trunk/py/test/rsession/testing/test_master.py Fri Jan 26 12:49:59 2007 @@ -19,7 +19,8 @@ # bind an empty config config = py.test.config._reparse([]) config._overwrite('dist_taskspernode', 10) - mod.pkgdir = py.path.local(py.__file__).dirpath() + mod.pkgdir = py.path.local(py.__file__).dirpath().dirpath() + mod.rootcol = py.test.collect.Directory(mod.pkgdir) class DummyGateway(object): def __init__(self): @@ -38,6 +39,7 @@ self.sent.append(item) def test_masternode(): + py.test.skip("cannot send non-fs items nowadays") try: raise ValueError() except ValueError: @@ -57,6 +59,7 @@ assert not received[1].outcome.passed def test_unique_nodes(): + py.test.skip("cannot send non-fs items nowadays") ch = DummyChannel() reportlist = [] mnode = MasterNode(ch, reportlist.append, {}) @@ -91,7 +94,8 @@ gw = py.execnet.PopenGateway() config = py.test.config._reparse([]) channel = setup_slave(gw, pkgdir, config) - channel.send(funcpass_spec) + spec = rootcol.getitembynames(funcpass_spec).get_collector_trail() + channel.send(spec) output = ReprOutcome(channel.receive()) assert output.passed channel.send(42) @@ -118,7 +122,6 @@ return mn master_nodes = [open_gw(), open_gw(), open_gw()] - rootcol = py.test.collect.Directory(pkgdir.dirpath()) funcpass_item = rootcol.getitembynames(funcpass_spec) funcfail_item = rootcol.getitembynames(funcfail_spec) itemgenerator = iter([funcfail_item] + @@ -147,7 +150,7 @@ return mn, gw, channel mn, gw, channel = open_gw() - rootcol = py.test.collect.Directory(pkgdir.dirpath()) + rootcol = py.test.collect.Directory(pkgdir) funchang_item = rootcol.getitembynames(funchang_spec) mn.send(funchang_item) mn.send(StopIteration) Modified: py/trunk/py/test/rsession/testing/test_rsession.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_rsession.py (original) +++ py/trunk/py/test/rsession/testing/test_rsession.py Fri Jan 26 12:49:59 2007 @@ -18,7 +18,8 @@ def test_setup_non_existing_hosts(): setup_events = [] hosts = [HostInfo("alskdjalsdkjasldkajlsd")] - hm = HostManager(hosts, None, pkgdir) + config = py.test.config._reparse([]) + hm = HostManager(hosts, config) cmd = "hm.init_hosts(setup_events.append)" py.test.raises((py.process.cmdexec.Error, IOError, EOFError), cmd) #assert setup_events @@ -36,23 +37,23 @@ fn = tmp.ensure("hello.py") assert RSession.getpkgdir(fn) == fn -def test_make_colitems(): - one = pkgdir.join("initpkg.py") - two = pkgdir.join("path", "__init__.py") - - cols = RSession.make_colitems([one, two], baseon=pkgdir) - assert len(cols) == 2 - col_one, col_two = cols - assert col_one.listnames() == ["py", "initpkg.py"] - assert col_two.listnames() == ["py", "path", "__init__.py"] - - cols = RSession.make_colitems([one, two], baseon=pkgdir.dirpath()) - assert len(cols) == 2 - col_one, col_two = cols - assert col_one.listnames() == [pkgdir.dirpath().basename, - "py", "initpkg.py"] - assert col_two.listnames() == [pkgdir.dirpath().basename, - "py", "path", "__init__.py"] +#def test_make_colitems(): +# one = pkgdir.join("initpkg.py") +# two = pkgdir.join("path", "__init__.py")# + +# cols = RSession.make_colitems([one, two], baseon=pkgdir) +# assert len(cols) == 2 +# col_one, col_two = cols +# assert col_one.listnames() == ["py", "initpkg.py"] +# assert col_two.listnames() == ["py", "path", "__init__.py"]# +# +# cols = RSession.make_colitems([one, two], baseon=pkgdir.dirpath()) +# assert len(cols) == 2 +# col_one, col_two = cols +# assert col_one.listnames() == [pkgdir.dirpath().basename, +# "py", "initpkg.py"] +# assert col_two.listnames() == [pkgdir.dirpath().basename, +# "py", "path", "__init__.py"] def test_example_tryiter(): events = [] @@ -161,7 +162,7 @@ config = py.test.config._reparse([]) opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) - hm = HostManager(hosts, config, pkgdir, opts) + hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(setup_events.append) hm.teardown_hosts(teardown_events.append, [node.channel for node in nodes], nodes) @@ -188,7 +189,7 @@ config = py.test.config._reparse([]) opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) - hm = HostManager(hosts, config, pkgdir, opts) + hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(allevents.append) from py.__.test.rsession.testing.test_executor \ @@ -235,7 +236,7 @@ defaultconftestnames.append("custom") try: opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) - hm = HostManager(hosts, config, pkgdir, opts) + hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(allevents.append) rootcol = py.test.collect.Directory(pkgdir.dirpath()) @@ -309,7 +310,7 @@ parse_directories(hosts) config = py.test.config._reparse([]) opts = HostOptions(do_sync=False, create_gateways=False) - hm = HostManager(hosts, config, pkgdir, opts) + hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(testevents.append) events = [i for i in testevents if isinstance(i, report.HostRSyncing)] assert len(events) == 4 Modified: py/trunk/py/test/rsession/testing/test_slave.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_slave.py (original) +++ py/trunk/py/test/rsession/testing/test_slave.py Fri Jan 26 12:49:59 2007 @@ -12,6 +12,7 @@ def setup_module(module): module.rootdir = py.path.local(py.__file__).dirpath().dirpath() + module.rootcol = py.test.collect.Directory(rootdir) # ---------------------------------------------------------------------- # inlined testing functions used below @@ -53,15 +54,15 @@ from py.__.test.rsession.executor import RunExecutor def gettestnode(): - rootcol = py.test.collect.Directory(rootdir) config = py.test.config._reparse([rootdir]) pidinfo = PidInfo() - node = SlaveNode(rootcol, config, pidinfo, executor=RunExecutor) + node = SlaveNode(config, pidinfo, executor=RunExecutor) return node def test_slave_run_passing(): node = gettestnode() - outcome = node.execute(funcpass_spec) + item = rootcol.getitembynames(funcpass_spec) + outcome = node.execute(item.get_collector_trail()) assert outcome.passed assert not outcome.setupfailure @@ -72,7 +73,8 @@ def test_slave_run_failing(): node = gettestnode() - outcome = node.execute(funcfail_spec) + item = rootcol.getitembynames(funcfail_spec) + outcome = node.execute(item.get_collector_trail()) assert not outcome.passed assert not outcome.setupfailure assert len(outcome.excinfo.traceback) == 1 @@ -86,7 +88,8 @@ def test_slave_run_skipping(): node = gettestnode() - outcome = node.execute(funcskip_spec) + item = rootcol.getitembynames(funcskip_spec) + outcome = node.execute(item.get_collector_trail()) assert not outcome.passed assert outcome.skipped @@ -97,7 +100,8 @@ def test_slave_run_failing_wrapped(): node = gettestnode() - repr_outcome = node.run(funcfail_spec) + item = rootcol.getitembynames(funcfail_spec) + repr_outcome = node.run(item.get_collector_trail()) outcome = ReprOutcome(repr_outcome) assert not outcome.passed assert not outcome.setupfailure @@ -105,9 +109,11 @@ def test_slave_main_simple(): res = [] + failitem = rootcol.getitembynames(funcfail_spec) + passitem = rootcol.getitembynames(funcpass_spec) q = [None, - funcpass_spec, - funcfail_spec + passitem.get_collector_trail(), + failitem.get_collector_trail() ] config = py.test.config._reparse([]) pidinfo = PidInfo() @@ -118,9 +124,11 @@ def test_slave_run_different_stuff(): node = gettestnode() - node.run("py doc log.txt".split()) + node.run(rootcol.getitembynames("py doc log.txt".split()). + get_collector_trail()) def test_slave_setup_fails_on_import_error(): + py.test.skip("WIP") tmp = py.test.ensuretemp("slavesetup") config = py.test.config._reparse([tmp]) class C: @@ -139,6 +147,12 @@ def close(self): pass + + def setcallback(self, cb): + pass + + def send(self, x): + pass try: exec py.code.Source(setup, "setup()").compile() in { @@ -149,6 +163,7 @@ py.test.fail("missing exception") def test_slave_setup_exit(): + py.test.skip("WIP") tmp = py.test.ensuretemp("slaveexit") tmp.ensure("__init__.py") q = py.std.Queue.Queue() @@ -187,6 +202,7 @@ py.test.fail("Did not exit") def test_slave_setup_fails_on_missing_pkg(): + py.test.skip("WIP") tmp = py.test.ensuretemp("slavesetup2") config = py.test.config._reparse([tmp]) x = tmp.ensure("sometestpackage", "__init__.py") From fijal at codespeak.net Fri Jan 26 12:50:23 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 26 Jan 2007 12:50:23 +0100 (CET) Subject: [py-svn] r37381 - py/trunk/py/test Message-ID: <20070126115023.EB19F1008F@code0.codespeak.net> Author: fijal Date: Fri Jan 26 12:50:22 2007 New Revision: 37381 Modified: py/trunk/py/test/collect.py Log: Add a shortcut. Modified: py/trunk/py/test/collect.py ============================================================================== --- py/trunk/py/test/collect.py (original) +++ py/trunk/py/test/collect.py Fri Jan 26 12:50:22 2007 @@ -250,7 +250,12 @@ def finishcapture(self): return None # by default collectors don't capture output def getouterr(self): - return self.captured_out, self.captured_err + return self.captured_out, self.captured_err + + def get_collector_trail(self): + """ Shortcut + """ + return self.config.get_collector_trail(self) class FSCollector(Collector): def __init__(self, fspath, parent=None): From guido at codespeak.net Fri Jan 26 14:01:29 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Fri, 26 Jan 2007 14:01:29 +0100 (CET) Subject: [py-svn] r37383 - in py/trunk/py/apigen: . testing Message-ID: <20070126130129.9C74810070@code0.codespeak.net> Author: guido Date: Fri Jan 26 14:01:27 2007 New Revision: 37383 Modified: py/trunk/py/apigen/api.js py/trunk/py/apigen/apigen.py py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/testing/test_apigen_example.py py/trunk/py/apigen/testing/test_apigen_functional.py Log: Added call stacks, made that method pages aren't built at all anymore, made that build_namespace_view isn't called for anything but namespaces anymore, made that parts of documents are hidden at first (with a link to 'open' them). Modified: py/trunk/py/apigen/api.js ============================================================================== --- py/trunk/py/apigen/api.js (original) +++ py/trunk/py/apigen/api.js Fri Jan 26 14:01:27 2007 @@ -1,7 +1,22 @@ function showhideel(el) { + /* show or hide the element + + sets the value of el.style.display to 'none' or 'block' depending + on the current value + */ if (el.style.display == 'none') { el.style.display = 'block'; } else { el.style.display = 'none'; }; }; + +function getnextsibling(el) { + /* return next non-text sibling (or null) */ + var node = el.nextSibling; + while (node && node.nodeType != 1) { + node = node.nextSibling; + }; + return node; +}; + Modified: py/trunk/py/apigen/apigen.py ============================================================================== --- py/trunk/py/apigen/apigen.py (original) +++ py/trunk/py/apigen/apigen.py Fri Jan 26 14:01:27 2007 @@ -37,7 +37,7 @@ ns_data = apb.prepare_namespace_pages(namespace_tree) class_names = dsa.get_class_names() - class_data, method_data = apb.prepare_class_pages(namespace_tree, + class_data = apb.prepare_class_pages(namespace_tree, class_names) function_names = dsa.get_function_names() func_data = apb.prepare_function_pages(namespace_tree, function_names) @@ -45,7 +45,7 @@ apb.build_namespace_pages(ns_data, proj) apb.build_class_pages(class_data, proj) - apb.build_method_pages(method_data, proj) + #apb.build_method_pages(method_data, proj) apb.build_function_pages(func_data, proj) spb.build_pages(source_data, proj, pkgdir) Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Fri Jan 26 14:01:27 2007 @@ -14,8 +14,11 @@ # HTML related stuff class H(html): - class Description(html.div): + class Content(html.div): style = html.Style(margin_left='15em') + + class Description(html.div): + pass class NamespaceDescription(Description): pass @@ -79,6 +82,12 @@ class ValueDescItem(html.li): pass + class CallStackDescription(Description): + pass + + class CallStackItem(html.div): + class_ = 'callstackitem' + def get_param_htmldesc(linker, func): """ get the html for the parameters of a function """ import inspect @@ -321,14 +330,23 @@ else: csource = H.SourceDef('could not get source file') + csdiv = H.div(style='display: none') + for cs, _ in self.dsa.get_function_callpoints(dotted_name): + csdiv.append(self.build_callsite(dotted_name, cs)) + callstack = H.CallStackDescription( + H.a('show/hide call sites', + href='#', + onclick='showhideel(getnextsibling(this)); return false;'), + csdiv, + ) snippet = H.FunctionDescription( H.FunctionDef(localname, argdesc), H.Docstring(docstring or H.em('no docstring available')), H.div(H.a('show/hide info', href='#', - onclick=('showhideel(this.parentNode.lastChild);' + onclick=('showhideel(getnextsibling(this));' 'return false;')), - H.div(valuedesc, csource, style='display: none', + H.div(valuedesc, csource, callstack, style='display: none', class_='funcinfo')), ) @@ -397,7 +415,7 @@ H.NamespaceDef(namespace_dotted_name), H.Docstring(docstring or H.em('no docstring available')) ) - for dotted_name in item_dotted_names: + for dotted_name in sorted(item_dotted_names): itemname = dotted_name.split('.')[-1] if is_private(itemname): continue @@ -412,26 +430,20 @@ def prepare_class_pages(self, namespace_tree, classes_dotted_names): passed = [] - methodsdata = [] - for dotted_name in classes_dotted_names: + for dotted_name in sorted(classes_dotted_names): parent_dotted_name, _ = split_of_last_part(dotted_name) try: sibling_dotted_names = namespace_tree[parent_dotted_name] except KeyError: # no siblings (built-in module or sth) sibling_dotted_names = [] - tag = self.build_class_view(dotted_name) + tag = H.Content(self.build_class_view(dotted_name)) nav = self.build_navigation(parent_dotted_name, sibling_dotted_names, dotted_name) reltargetpath = "api/%s.html" % (dotted_name,) self.linker.set_link(dotted_name, reltargetpath) passed.append((dotted_name, tag, nav, reltargetpath)) - method_dotted_names = ['%s.%s' % (dotted_name, method_name) for - method_name in - self.dsa.get_class_methods(dotted_name)] - methodsdata += self.prepare_method_pages(namespace_tree, - method_dotted_names) - return passed, methodsdata + return passed def build_class_pages(self, data, project): """ build the full api pages for a set of classes """ @@ -443,7 +455,7 @@ # XXX note that even though these pages are still built, there's no nav # pointing to them anymore... passed = [] - for dotted_name in method_dotted_names: + for dotted_name in sorted(method_dotted_names): parent_dotted_name, _ = split_of_last_part(dotted_name) module_dotted_name, _ = split_of_last_part(parent_dotted_name) sibling_dotted_names = namespace_tree[module_dotted_name] @@ -462,11 +474,11 @@ def prepare_function_pages(self, namespace_tree, method_dotted_names): passed = [] - for dotted_name in method_dotted_names: + for dotted_name in sorted(method_dotted_names): # XXX should we create a build_function_view instead? parent_dotted_name, _ = split_of_last_part(dotted_name) sibling_dotted_names = namespace_tree[parent_dotted_name] - tag = self.build_callable_view(dotted_name) + tag = H.Content(self.build_callable_view(dotted_name)) nav = self.build_navigation(parent_dotted_name, sibling_dotted_names, dotted_name) reltargetpath = "api/%s.html" % (dotted_name,) @@ -485,9 +497,14 @@ names = namespace_tree.keys() names.sort() - for dotted_name in names: + function_names = self.dsa.get_function_names() + class_names = self.dsa.get_class_names() + for dotted_name in sorted(names): + if dotted_name in function_names or dotted_name in class_names: + continue subitem_dotted_names = namespace_tree[dotted_name] - tag = self.build_namespace_view(dotted_name, subitem_dotted_names) + tag = H.Content(self.build_namespace_view(dotted_name, + subitem_dotted_names)) nav = self.build_navigation(dotted_name, subitem_dotted_names, dotted_name) if dotted_name == '': @@ -588,3 +605,42 @@ def is_in_pkg(self, sourcefile): return py.path.local(sourcefile).relto(self.projpath) + def build_callsite(self, functionname, call_site): + tbtag = self.gen_traceback(functionname, call_site) + tag = H.CallStackItem( + H.a("%s - line %s" % (call_site[0].filename, call_site[0].lineno + 1), + href='#', + onclick="showhideel(getnextsibling(this)); return false;"), + H.div(tbtag, style='display: none') + ) + return tag + + def gen_traceback(self, funcname, call_site): + tbdiv = H.div() + for line in call_site: + lineno = line.lineno - line.firstlineno + source = line.source + sourcefile = line.filename + mangled = [] + for i, sline in enumerate(str(source).split('\n')): + if i == lineno: + l = '-> %s' % (sline,) + else: + l = ' %s' % (sline,) + mangled.append(l) + if sourcefile: + linktext = '%s - line %s' % (sourcefile, line.lineno + 1) + # skip py.code.Source objects and source files outside of the + # package + if (not sourcefile.startswith('None') and + self.is_in_pkg(sourcefile)): + href = self.linker.get_lazyhref(sourcefile) + sourcelink = H.a(linktext, href=href) + else: + sourcelink = H.div(linktext) + else: + sourcelink = H.div('source unknown') + tbdiv.append(sourcelink) + tbdiv.append(H.pre('\n'.join(mangled))) + return tbdiv + Modified: py/trunk/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_example.py (original) +++ py/trunk/py/apigen/testing/test_apigen_example.py Fri Jan 26 14:01:27 2007 @@ -163,9 +163,9 @@ _checkhtmlsnippet(html) def test_build_class_pages(self): - data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeClass', - 'main.SomeSubClass']) + data = self.apb.prepare_class_pages(self.namespace_tree, + ['main.SomeClass', + 'main.SomeSubClass']) self.apb.build_class_pages(data, self.project) clsfile = self.base.join('api/main.SomeClass.html') assert clsfile.check() @@ -173,10 +173,10 @@ _checkhtml(html) def test_build_class_pages_instance(self): - data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeClass', - 'main.SomeSubClass', - 'main.SomeInstance']) + data = self.apb.prepare_class_pages(self.namespace_tree, + ['main.SomeClass', + 'main.SomeSubClass', + 'main.SomeInstance']) self.apb.build_class_pages(data, self.project) clsfile = self.base.join('api/main.SomeInstance.html') assert clsfile.check() @@ -187,9 +187,9 @@ ]) def test_build_class_pages_nav_links(self): - data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeSubClass', - 'main.SomeClass']) + data = self.apb.prepare_class_pages(self.namespace_tree, + ['main.SomeSubClass', + 'main.SomeClass']) # fake some stuff that would be built from other methods self.linker.set_link('', 'api/index.html') self.linker.set_link('main', 'api/main.html') @@ -212,9 +212,9 @@ _checkhtml(html) def test_build_class_pages_base_link(self): - data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeSubClass', - 'main.SomeClass']) + data = self.apb.prepare_class_pages(self.namespace_tree, + ['main.SomeSubClass', + 'main.SomeClass']) self.apb.build_class_pages(data, self.project) clsfile = self.base.join('api/main.SomeSubClass.html') assert clsfile.check() @@ -227,9 +227,9 @@ _checkhtml(html) def test_source_links(self): - data, methodsdata = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeSubClass', - 'main.SomeClass']) + data = self.apb.prepare_class_pages(self.namespace_tree, + ['main.SomeSubClass', + 'main.SomeClass']) sourcedata = self.spb.prepare_pages(self.fs_root) self.apb.build_class_pages(data, self.project) self.spb.build_pages(sourcedata, self.project, self.fs_root) Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Fri Jan 26 14:01:27 2007 @@ -113,9 +113,9 @@ html = sometestclass_source.read() assert '

sources for sometestclass.py

' in html - # XXX later... - #index = sourcedir.join('index.html') - #assert index.check(file=True) - #html = index.read() - #assert 'main' in html + index = sourcedir.join('index.html') + assert index.check(file=True) + html = index.read() + print html + assert 'test' in html From guido at codespeak.net Fri Jan 26 16:34:30 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Fri, 26 Jan 2007 16:34:30 +0100 (CET) Subject: [py-svn] r37395 - in py/trunk/py/apigen: . testing Message-ID: <20070126153430.9E7AC10079@code0.codespeak.net> Author: guido Date: Fri Jan 26 16:34:28 2007 New Revision: 37395 Modified: py/trunk/py/apigen/apigen.py py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/testing/test_apigen_example.py py/trunk/py/apigen/testing/test_apigen_functional.py Log: Fixed some small issues in source nav, turned namespace_tree into an instance var (finally! :), changed the api nav so it now shows the full tree with the current item unfolded + siblings of itself and all parents (+ children if it's a namespace item). Modified: py/trunk/py/apigen/apigen.py ============================================================================== --- py/trunk/py/apigen/apigen.py (original) +++ py/trunk/py/apigen/apigen.py Fri Jan 26 16:34:28 2007 @@ -14,11 +14,7 @@ def get_documentable_items(pkgdir): sys.path.insert(0, str(pkgdir.dirpath())) rootmod = __import__(pkgdir.basename) - #rootmod = import_pkgdir(pkgdir) - if hasattr(rootmod, '__package__'): - return rootmod - # XXX fix non-initpkg situations(?) - return {} + return rootmod def build(pkgdir, dsa): l = linker.Linker() @@ -32,15 +28,14 @@ all_names = dsa._get_names(filter=lambda x, y: True) namespace_tree = htmlgen.create_namespace_tree(all_names) - apb = htmlgen.ApiPageBuilder(targetdir, l, dsa, pkgdir) + apb = htmlgen.ApiPageBuilder(targetdir, l, dsa, pkgdir, namespace_tree) spb = htmlgen.SourcePageBuilder(targetdir, l, pkgdir) - ns_data = apb.prepare_namespace_pages(namespace_tree) + ns_data = apb.prepare_namespace_pages() class_names = dsa.get_class_names() - class_data = apb.prepare_class_pages(namespace_tree, - class_names) + class_data = apb.prepare_class_pages(class_names) function_names = dsa.get_function_names() - func_data = apb.prepare_function_pages(namespace_tree, function_names) + func_data = apb.prepare_function_pages(function_names) source_data = spb.prepare_pages(pkgdir) apb.build_namespace_pages(ns_data, proj) Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Fri Jan 26 16:34:28 2007 @@ -180,16 +180,17 @@ path = relpath.split(os.path.sep) indent = 0 # build links to parents - for i in xrange(len(path)): - dirpath = os.path.sep.join(path[:i]) - abspath = self.projroot.join(dirpath).strpath - if i == 0: - text = 'root' - else: - text = path[i-1] - nav.append(build_navitem_html(self.linker, text, abspath, - indent, False)) - indent += 1 + if relpath != '': + for i in xrange(len(path)): + dirpath = os.path.sep.join(path[:i]) + abspath = self.projroot.join(dirpath).strpath + if i == 0: + text = self.projroot.basename + else: + text = path[i-1] + nav.append(build_navitem_html(self.linker, text, abspath, + indent, False)) + indent += 1 # build siblings or children and self if fspath.check(dir=True): # we're a dir, build ourselves and our children @@ -296,12 +297,13 @@ class ApiPageBuilder(AbstractPageBuilder): """ builds the html for an api docs page """ - def __init__(self, base, linker, dsa, projroot): + def __init__(self, base, linker, dsa, projroot, namespace_tree): self.base = base self.linker = linker self.dsa = dsa self.projroot = projroot self.projpath = py.path.local(projroot) + self.namespace_tree = namespace_tree def build_callable_view(self, dotted_name): """ build the html for a class method """ @@ -428,18 +430,17 @@ ) return snippet - def prepare_class_pages(self, namespace_tree, classes_dotted_names): + def prepare_class_pages(self, classes_dotted_names): passed = [] for dotted_name in sorted(classes_dotted_names): parent_dotted_name, _ = split_of_last_part(dotted_name) try: - sibling_dotted_names = namespace_tree[parent_dotted_name] + sibling_dotted_names = self.namespace_tree[parent_dotted_name] except KeyError: # no siblings (built-in module or sth) sibling_dotted_names = [] tag = H.Content(self.build_class_view(dotted_name)) - nav = self.build_navigation(parent_dotted_name, - sibling_dotted_names, dotted_name) + nav = self.build_navigation(dotted_name, False) reltargetpath = "api/%s.html" % (dotted_name,) self.linker.set_link(dotted_name, reltargetpath) passed.append((dotted_name, tag, nav, reltargetpath)) @@ -451,17 +452,16 @@ title = 'api documentation for %s' % (dotted_name,) self.write_page(title, reltargetpath, project, tag, nav) - def prepare_method_pages(self, namespace_tree, method_dotted_names): + def prepare_method_pages(self, method_dotted_names): # XXX note that even though these pages are still built, there's no nav # pointing to them anymore... passed = [] for dotted_name in sorted(method_dotted_names): parent_dotted_name, _ = split_of_last_part(dotted_name) module_dotted_name, _ = split_of_last_part(parent_dotted_name) - sibling_dotted_names = namespace_tree[module_dotted_name] + sibling_dotted_names = self.namespace_tree[module_dotted_name] tag = self.build_callable_view(dotted_name) - nav = self.build_navigation(parent_dotted_name, - sibling_dotted_names, dotted_name) + nav = self.build_navigation(dotted_name, False) reltargetpath = "api/%s.html" % (dotted_name,) self.linker.set_link(dotted_name, reltargetpath) passed.append((dotted_name, tag, nav, reltargetpath)) @@ -472,15 +472,14 @@ title = 'api documentation for %s' % (dotted_name,) self.write_page(title, reltargetpath, project, tag, nav) - def prepare_function_pages(self, namespace_tree, method_dotted_names): + def prepare_function_pages(self, method_dotted_names): passed = [] for dotted_name in sorted(method_dotted_names): # XXX should we create a build_function_view instead? parent_dotted_name, _ = split_of_last_part(dotted_name) - sibling_dotted_names = namespace_tree[parent_dotted_name] + sibling_dotted_names = self.namespace_tree[parent_dotted_name] tag = H.Content(self.build_callable_view(dotted_name)) - nav = self.build_navigation(parent_dotted_name, - sibling_dotted_names, dotted_name) + nav = self.build_navigation(dotted_name, False) reltargetpath = "api/%s.html" % (dotted_name,) self.linker.set_link(dotted_name, reltargetpath) passed.append((dotted_name, tag, nav, reltargetpath)) @@ -491,22 +490,21 @@ title = 'api documentation for %s' % (dotted_name,) self.write_page(title, reltargetpath, project, tag, nav) - def prepare_namespace_pages(self, namespace_tree): + def prepare_namespace_pages(self): passed = [] module_name = self.dsa.get_module_name().split('/')[-1] - names = namespace_tree.keys() + names = self.namespace_tree.keys() names.sort() function_names = self.dsa.get_function_names() class_names = self.dsa.get_class_names() for dotted_name in sorted(names): if dotted_name in function_names or dotted_name in class_names: continue - subitem_dotted_names = namespace_tree[dotted_name] + subitem_dotted_names = self.namespace_tree[dotted_name] tag = H.Content(self.build_namespace_view(dotted_name, subitem_dotted_names)) - nav = self.build_navigation(dotted_name, subitem_dotted_names, - dotted_name) + nav = self.build_navigation(dotted_name, True) if dotted_name == '': reltargetpath = 'api/index.html' else: @@ -522,7 +520,39 @@ title = 'index of %s namespace' % (dotted_name,) self.write_page(title, reltargetpath, project, tag, nav) - def build_navigation(self, dotted_name, item_dotted_names, selection): + def build_navigation(self, dotted_name, build_children=True): + navitems = [] + + # top namespace, index.html + module_name = self.dsa.get_module_name().split('/')[-1] + navitems.append(build_navitem_html(self.linker, module_name, '', 0, + True)) + def build_nav_level(dotted_name, depth=1): + navitems = [] + path = dotted_name.split('.')[:depth] + siblings = self.namespace_tree.get('.'.join(path[:-1])) + for dn in sorted(siblings): + selected = dn == '.'.join(path) + sibpath = dn.split('.') + navitems.append(build_navitem_html(self.linker, sibpath[-1], + dn, depth, + selected)) + if selected: + lastlevel = dn.count('.') == dotted_name.count('.') + if not lastlevel: + navitems += build_nav_level(dotted_name, depth+1) + elif lastlevel and build_children: + # XXX hack + navitems += build_nav_level('%s.' % (dotted_name,), + depth+2) + + return navitems + + navitems += build_nav_level(dotted_name) + return H.Navigation(*navitems) + + + navitems = [] # top namespace, index.html Modified: py/trunk/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_example.py (original) +++ py/trunk/py/apigen/testing/test_apigen_example.py Fri Jan 26 16:34:28 2007 @@ -104,15 +104,19 @@ self.base = base = py.test.ensuretemp('%s_%s' % ( self.__class__.__name__, meth.im_func.func_name)) self.linker = linker = LinkerForTests() - self.apb = ApiPageBuilder(base, linker, self.dsa, self.fs_root) - self.spb = SourcePageBuilder(base, linker, self.fs_root) - self.namespace_tree = create_namespace_tree(['main.sub', - 'main.sub.func', - 'main.SomeClass', - 'main.SomeSubClass', - 'main.SomeInstance', - 'other.foo', - 'other.bar']) + namespace_tree = create_namespace_tree(['main.sub', + 'main.sub.func', + 'main.SomeClass', + 'main.SomeSubClass', + 'main.SomeInstance', + 'other.foo', + 'other.bar']) + self.namespace_tree = namespace_tree + self.apb = ApiPageBuilder(base, linker, self.dsa, + self.fs_root.join(self.pkg_name), + namespace_tree) + self.spb = SourcePageBuilder(base, linker, + self.fs_root.join(self.pkg_name)) class TestApiPageBuilder(AbstractBuilderTest): def test_build_callable_view(self): @@ -123,7 +127,8 @@ pkg.main.sub.func(10) pkg.main.sub.func(pkg.main.SomeClass(10)) t.end_tracing() - apb = ApiPageBuilder(self.base, self.linker, dsa, self.fs_root) + apb = ApiPageBuilder(self.base, self.linker, dsa, self.fs_root, + self.namespace_tree) snippet = apb.build_callable_view('main.sub.func') html = snippet.unicode() print html @@ -149,8 +154,7 @@ _checkhtmlsnippet(html) def test_build_function_pages(self): - data = self.apb.prepare_function_pages(self.namespace_tree, - ['main.sub.func']) + data = self.apb.prepare_function_pages(['main.sub.func']) self.apb.build_function_pages(data, self.project) funcfile = self.base.join('api/main.sub.func.html') assert funcfile.check() @@ -163,8 +167,7 @@ _checkhtmlsnippet(html) def test_build_class_pages(self): - data = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeClass', + data = self.apb.prepare_class_pages(['main.SomeClass', 'main.SomeSubClass']) self.apb.build_class_pages(data, self.project) clsfile = self.base.join('api/main.SomeClass.html') @@ -173,8 +176,7 @@ _checkhtml(html) def test_build_class_pages_instance(self): - data = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeClass', + data = self.apb.prepare_class_pages(['main.SomeClass', 'main.SomeSubClass', 'main.SomeInstance']) self.apb.build_class_pages(data, self.project) @@ -187,8 +189,7 @@ ]) def test_build_class_pages_nav_links(self): - data = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeSubClass', + data = self.apb.prepare_class_pages(['main.SomeSubClass', 'main.SomeClass']) # fake some stuff that would be built from other methods self.linker.set_link('', 'api/index.html') @@ -212,8 +213,7 @@ _checkhtml(html) def test_build_class_pages_base_link(self): - data = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeSubClass', + data = self.apb.prepare_class_pages(['main.SomeSubClass', 'main.SomeClass']) self.apb.build_class_pages(data, self.project) clsfile = self.base.join('api/main.SomeSubClass.html') @@ -227,8 +227,7 @@ _checkhtml(html) def test_source_links(self): - data = self.apb.prepare_class_pages(self.namespace_tree, - ['main.SomeSubClass', + data = self.apb.prepare_class_pages(['main.SomeSubClass', 'main.SomeClass']) sourcedata = self.spb.prepare_pages(self.fs_root) self.apb.build_class_pages(data, self.project) @@ -238,7 +237,7 @@ _checkhtml(funchtml) def test_build_namespace_pages(self): - data = self.apb.prepare_namespace_pages(self.namespace_tree) + data = self.apb.prepare_namespace_pages() self.apb.build_namespace_pages(data, self.project) mainfile = self.base.join('api/main.html') assert mainfile.check() @@ -258,7 +257,7 @@ _checkhtml(otherhtml) def test_build_namespace_pages_index(self): - data = self.apb.prepare_namespace_pages(self.namespace_tree) + data = self.apb.prepare_namespace_pages() self.apb.build_namespace_pages(data, self.project) pkgfile = self.base.join('api/index.html') assert pkgfile.check() @@ -267,7 +266,7 @@ _checkhtml(html) def test_build_namespace_pages_subnamespace(self): - data = self.apb.prepare_namespace_pages(self.namespace_tree) + data = self.apb.prepare_namespace_pages() self.apb.build_namespace_pages(data, self.project) subfile = self.base.join('api/main.sub.html') assert subfile.check() @@ -275,8 +274,7 @@ _checkhtml(html) def test_build_function_api_pages_nav(self): - data = self.apb.prepare_function_pages(self.namespace_tree, - ['main.sub.func']) + data = self.apb.prepare_function_pages(['main.sub.func']) self.linker.set_link('', 'api/index.html') self.linker.set_link('main', 'api/main.html') self.linker.set_link('main.sub', 'api/main.sub.html') @@ -293,22 +291,30 @@ _checkhtml(html) def test_build_function_navigation(self): - self.apb.prepare_namespace_pages(self.namespace_tree) - self.apb.prepare_function_pages(self.namespace_tree, ['main.sub.func']) - nav = self.apb.build_navigation('main.sub', ['main.sub.func'], - 'main.sub.func') + self.apb.prepare_namespace_pages() + self.apb.prepare_function_pages(['main.sub.func']) + self.apb.prepare_class_pages(['main.SomeClass', + 'main.SomeSubClass', + 'main.SomeInstance']) + nav = self.apb.build_navigation('main.sub.func', False) html = nav.unicode(indent=0) print html.encode('UTF-8') - assert (u'

pkg

' - u'

\xa0\xa0main

' - u'

\xa0\xa0\xa0\xa0' + assert (u'

pkg

' + u'

\xa0\xa0main

' + u'

\xa0\xa0\xa0\xa0' + u'SomeClass

' + u'

\xa0\xa0\xa0\xa0' + u'SomeInstance

' + u'

\xa0\xa0\xa0\xa0' + u'SomeSubClass

' + u'

\xa0\xa0\xa0\xa0' u'sub

' u'

\xa0\xa0\xa0\xa0\xa0\xa0' u'func

' ) in html def test_build_root_namespace_view(self): - data = self.apb.prepare_namespace_pages(self.namespace_tree) + data = self.apb.prepare_namespace_pages() self.apb.build_namespace_pages(data, self.project) rootfile = self.base.join('api/index.html') assert rootfile.check() @@ -332,7 +338,6 @@ print html run_string_sequence_test(html, [ 'href="../../style.css"', - 'root', 'pkg', 'someclass.py', 'somesubclass.py', @@ -347,7 +352,6 @@ print html run_string_sequence_test(html, [ 'href="../../style.css"', - 'root', 'pkg', 'func.py', 'someclass.py', @@ -362,7 +366,6 @@ html = nav.unicode(indent=0) print html.encode('UTF-8') run_string_sequence_test(html, [ - 'href="source/index.html">root', 'href="source/pkg/index.html">pkg', 'href="source/pkg/func.py.html">func.py', 'href="source/pkg/someclass.py.html">someclass.py', Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Fri Jan 26 16:34:28 2007 @@ -4,6 +4,7 @@ """ import py +from py.__.apigen import apigen def setup_fs_project(): temp = py.test.ensuretemp('apigen_functional') @@ -70,6 +71,13 @@ """)) return temp, 'pkg' +def test_get_documentable_items(): + fs_root, package_name = setup_fs_project() + documentable = apigen.get_documentable_items(fs_root.join(package_name)) + assert documentable.__package__.exportdefs.keys() == [ + 'main.sub.func', 'main.func', 'main.SomeTestSubClass', + 'main.SomeTestClass'] + def test_apigen_functional(): fs_root, package_name = setup_fs_project() tempdir = py.test.ensuretemp('test_apigen_functional_results') From fijal at codespeak.net Fri Jan 26 22:46:13 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 26 Jan 2007 22:46:13 +0100 (CET) Subject: [py-svn] r37407 - in py/trunk/py/test/rsession: . testing Message-ID: <20070126214613.A3FC310071@code0.codespeak.net> Author: fijal Date: Fri Jan 26 22:46:11 2007 New Revision: 37407 Modified: py/trunk/py/test/rsession/master.py py/trunk/py/test/rsession/testing/test_master.py Log: Unskip two tests. Modified: py/trunk/py/test/rsession/master.py ============================================================================== --- py/trunk/py/test/rsession/master.py (original) +++ py/trunk/py/test/rsession/master.py Fri Jan 26 22:46:11 2007 @@ -30,7 +30,7 @@ else: self.pending.insert(0, item) #itemspec = item.listnames()[1:] - self.channel.send(item.config.get_collector_trail(item)) + self.channel.send(item.get_collector_trail()) # send start report self.reporter(report.SendItem(self.channel, item)) Modified: py/trunk/py/test/rsession/testing/test_master.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_master.py (original) +++ py/trunk/py/test/rsession/testing/test_master.py Fri Jan 26 22:46:11 2007 @@ -38,8 +38,11 @@ assert py.std.marshal.dumps(item) self.sent.append(item) +class Item(py.test.Item): + def get_collector_trail(self): + return (self.name,) + def test_masternode(): - py.test.skip("cannot send non-fs items nowadays") try: raise ValueError() except ValueError: @@ -48,8 +51,8 @@ ch = DummyChannel() reportlist = [] mnode = MasterNode(ch, reportlist.append, {}) - mnode.send(py.test.Item("ok")) - mnode.send(py.test.Item("notok")) + mnode.send(Item("ok")) + mnode.send(Item("notok")) ch.callback(Outcome().make_repr()) ch.callback(Outcome(excinfo=excinfo).make_repr()) assert len(reportlist) == 4 @@ -59,12 +62,11 @@ assert not received[1].outcome.passed def test_unique_nodes(): - py.test.skip("cannot send non-fs items nowadays") ch = DummyChannel() reportlist = [] mnode = MasterNode(ch, reportlist.append, {}) - mnode.send(py.test.Item("ok")) - mnode.send(py.test.Item("ok")) + mnode.send(Item("ok")) + mnode.send(Item("ok")) ch.callback(Outcome().make_repr()) ch.callback(Outcome().make_repr()) assert len(reportlist) == 3 From fijal at codespeak.net Fri Jan 26 22:54:55 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 26 Jan 2007 22:54:55 +0100 (CET) Subject: [py-svn] r37408 - py/trunk/py/test/rsession/testing Message-ID: <20070126215455.BAE9510071@code0.codespeak.net> Author: fijal Date: Fri Jan 26 22:54:52 2007 New Revision: 37408 Modified: py/trunk/py/test/rsession/testing/test_slave.py Log: Kill two unnecessary tests now. Modified: py/trunk/py/test/rsession/testing/test_slave.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_slave.py (original) +++ py/trunk/py/test/rsession/testing/test_slave.py Fri Jan 26 22:54:52 2007 @@ -127,43 +127,7 @@ node.run(rootcol.getitembynames("py doc log.txt".split()). get_collector_trail()) -def test_slave_setup_fails_on_import_error(): - py.test.skip("WIP") - tmp = py.test.ensuretemp("slavesetup") - config = py.test.config._reparse([tmp]) - class C: - def __init__(self): - self.count = 0 - - def receive(self): - if self.count == 0: - retval = str(tmp) - elif self.count == 1: - retval = config.make_repr(conftestnames=['dist_nicelevel']) - else: - raise NotImplementedError("more data") - self.count += 1 - return retval - - def close(self): - pass - - def setcallback(self, cb): - pass - - def send(self, x): - pass - - try: - exec py.code.Source(setup, "setup()").compile() in { - 'channel': C()} - except ImportError: - pass # expected - else: - py.test.fail("missing exception") - def test_slave_setup_exit(): - py.test.skip("WIP") tmp = py.test.ensuretemp("slaveexit") tmp.ensure("__init__.py") q = py.std.Queue.Queue() @@ -201,43 +165,6 @@ else: py.test.fail("Did not exit") -def test_slave_setup_fails_on_missing_pkg(): - py.test.skip("WIP") - tmp = py.test.ensuretemp("slavesetup2") - config = py.test.config._reparse([tmp]) - x = tmp.ensure("sometestpackage", "__init__.py") - class C: - def __init__(self): - self.count = 0 - - def receive(self): - if self.count == 0: - retval = str(x.dirpath()) - elif self.count == 1: - retval = config.make_repr(conftestnames=['dist_nicelevel']) - else: - raise NotImplementedError("more data") - self.count += 1 - return retval - try: - exec py.code.Source(setup, "setup()").compile() in {'channel': C()} - except AttributeError: # channel.send - pass - else: - py.test.fail("missing exception") - - # now create a parallel structure - tmp = py.test.ensuretemp("slavesetup3") - x = tmp.ensure("sometestpackage", "__init__.py") - try: - exec py.code.Source(setup, "setup()").compile() in { - 'channel': C()} - except AssertionError: - pass # expected - else: - py.test.fail("missing exception") - - def test_pidinfo(): if not hasattr(os, 'fork') or not hasattr(os, 'waitpid'): py.test.skip("Platform does not support fork") From fijal at codespeak.net Fri Jan 26 22:56:52 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 26 Jan 2007 22:56:52 +0100 (CET) Subject: [py-svn] r37409 - py/trunk/py/test/rsession/testing Message-ID: <20070126215652.EEBE510071@code0.codespeak.net> Author: fijal Date: Fri Jan 26 22:56:50 2007 New Revision: 37409 Modified: py/trunk/py/test/rsession/testing/test_webjs.py Log: Fix the test Modified: py/trunk/py/test/rsession/testing/test_webjs.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_webjs.py (original) +++ py/trunk/py/test/rsession/testing/test_webjs.py Fri Jan 26 22:56:50 2007 @@ -4,7 +4,6 @@ import pypy from pypy.translator.js.modules import dom from pypy.translator.js.tester import schedule_callbacks - from py.__.test.rsession.rsession import session_options dom.Window # check whether dom was properly imported or is just a # leftover in sys.modules except (ImportError, AttributeError): From fijal at codespeak.net Fri Jan 26 23:35:35 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 26 Jan 2007 23:35:35 +0100 (CET) Subject: [py-svn] r37411 - in py/trunk/py/test/rsession: . testing Message-ID: <20070126223535.782AD10079@code0.codespeak.net> Author: fijal Date: Fri Jan 26 23:35:20 2007 New Revision: 37411 Modified: py/trunk/py/test/rsession/rest.py py/trunk/py/test/rsession/testing/test_rest.py Log: Fix a bit rest and test_rest. Note that actually these tests are testing anything from time to time, need closer look. Modified: py/trunk/py/test/rsession/rest.py ============================================================================== --- py/trunk/py/test/rsession/rest.py (original) +++ py/trunk/py/test/rsession/rest.py Fri Jan 26 23:35:20 2007 @@ -37,20 +37,21 @@ return self.hosts[0] def report_SendItem(self, item): - address = self.gethost(item) + address = self.gethost(item).hostname if self.config.option.verbose: self.add_rest(Paragraph('sending item %s to %s' % (item.item, address))) def report_HostRSyncing(self, item): self.add_rest(LiteralBlock('%10s: RSYNC ==> %s' % (item.host.hostname[:10], - item.remoterootpath))) + item.host.relpath))) def report_HostReady(self, item): self.add_rest(LiteralBlock('%10s: READY' % (item.host.hostname[:10],))) def report_TestStarted(self, event): - txt = "Running tests on hosts: %s" % ", ".join(event.hosts) + txt = "Running tests on hosts: %s" % ", ".join([i.hostname for i in + event.hosts]) self.add_rest(Title(txt, abovechar='=', belowchar='=')) self.timestart = event.timestart Modified: py/trunk/py/test/rsession/testing/test_rest.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_rest.py (original) +++ py/trunk/py/test/rsession/testing/test_rest.py Fri Jan 26 23:35:20 2007 @@ -9,24 +9,13 @@ from py.__.test.rsession.rest import RestReporter, NoLinkWriter from py.__.rest.rst import * from py.__.test.rsession.hostmanage import HostInfo - -py.test.skip("This tests are not really testing, needs rewrite") +from py.__.test.rsession.outcome import Outcome class RestTestReporter(RestReporter): def __init__(self, *args, **kwargs): if args: super(RestReporter, self).__init__(*args, **kwargs) -class Container(object): - def __init__(self, **kwargs): - self.__dict__.update(kwargs) - -class FakeOutcome(Container, report.ReceivedItemOutcome): - pass - -class FakeTryiter(Container, report.SkippedTryiter): - pass - class TestRestUnits(object): def setup_method(self, method): config = py.test.config._reparse(["some_sub"]) @@ -47,30 +36,31 @@ self.config.option.verbose = False def test_report_SendItem(self): - item = Container(item='foo/bar.py', channel=ch) - reporter.report_SendItem(item) + event = report.SendItem(item='foo/bar.py', channel=ch) + reporter.report(event) assert stdout.getvalue() == '' stdout.seek(0) stdout.truncate() reporter.config.option.verbose = True - reporter.report_SendItem(item) + reporter.report(event) assert stdout.getvalue() == ('sending item foo/bar.py to ' 'localhost\n\n') def test_report_HostRSyncing(self): - item = Container(hostname='localhost', remoterootpath='/foo/bar') - reporter.report_HostRSyncing(item) + event = report.HostRSyncing(HostInfo('localhost', '/foo/bar')) + reporter.report(event) assert stdout.getvalue() == ('::\n\n localhost: RSYNC ==> ' '/foo/bar\n\n') def test_report_HostReady(self): - item = Container(hostname='localhost') - reporter.report_HostReady(item) + event = report.HostReady(HostInfo('localhost')) + reporter.report(event) assert stdout.getvalue() == '::\n\n localhost: READY\n\n' def test_report_TestStarted(self): - event = Container(hosts=['localhost', 'foo.com'], timestart=0) - reporter.report_TestStarted(event) + event = report.TestStarted(hosts=[HostInfo('localhost'), + HostInfo('foo.com')]) + reporter.report(event) assert stdout.getvalue() == """\ =========================================== Running tests on hosts\: localhost, foo.com @@ -87,9 +77,15 @@ return ['test_foo', 'test_bar'] def listnames(self): return ['package', 'foo', 'bar.py'] + + class Container(object): + def __init__(self, **args): + for arg, val in args.items(): + setattr(self, arg, val) + parent = Container(parent=None, fspath=py.path.local('.')) - event = Container(item=FakeModule(parent)) - reporter.report_ItemStart(event) + event = report.ItemStart(item=FakeModule(parent)) + reporter.report(event) assert stdout.getvalue() == """\ Testing module foo/bar.py (2 items) ----------------------------------- @@ -108,32 +104,58 @@ """ def test_ReceivedItemOutcome_PASSED(self): - outcome = Container(passed=True, excinfo=False) + outcome = Outcome() + class Container(object): + def __init__(self, **args): + for arg, val in args.items(): + setattr(self, arg, val) + item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz']) - event = Container(channel=ch, outcome=outcome, item=item) - reporter.report_ReceivedItemOutcome(event) + event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, item=item) + reporter.report(event) assert stdout.getvalue() == ('* localhost\\: **PASSED** ' 'foo.py/bar()/baz\n\n') def test_ReceivedItemOutcome_SKIPPED(self): - outcome = Container(passed=False, skipped=True, excinfo=False) + class Container(object): + def __init__(self, **args): + for arg, val in args.items(): + setattr(self, arg, val) + + outcome = Outcome(skipped="reason") item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz']) - event = Container(channel=ch, outcome=outcome, item=item) - reporter.report_ReceivedItemOutcome(event) + event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, item=item) + reporter.report(event) assert stdout.getvalue() == ('* localhost\\: **SKIPPED** ' 'foo.py/bar()/baz\n\n') def test_ReceivedItemOutcome_FAILED(self): - outcome = Container(passed=False, skipped=False) + class Container(object): + def __init__(self, **args): + for arg, val in args.items(): + setattr(self, arg, val) + + outcome = Outcome(excinfo="xxx") item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz']) - event = Container(channel=ch, outcome=outcome, item=item) - reporter.report_ReceivedItemOutcome(event) + event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, item=item) + reporter.report(event) assert stdout.getvalue() == """\ * localhost\: **FAILED** `traceback0`_ foo.py/bar()/baz """ def test_skips(self): + class Container(object): + def __init__(self, **args): + for arg, val in args.items(): + setattr(self, arg, val) + + class FakeOutcome(Container, report.ReceivedItemOutcome): + pass + + class FakeTryiter(Container, report.SkippedTryiter): + pass + reporter.skips() assert stdout.getvalue() == '' reporter.skipped_tests_outcome = [ @@ -153,6 +175,15 @@ """ def test_failures(self): + py.test.skip("This one is totally artificial, needs to be rewritten") + class Container(object): + def __init__(self, **args): + for arg, val in args.items(): + setattr(self, arg, val) + + class FakeOutcome(Container, report.ReceivedItemOutcome): + pass + parent = Container(parent=None, fspath=py.path.local('.')) reporter.failed_tests_outcome = [ FakeOutcome( From guido at codespeak.net Sat Jan 27 13:29:41 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 13:29:41 +0100 (CET) Subject: [py-svn] r37425 - in py/trunk/py/code: . testing Message-ID: <20070127122941.192F510076@code0.codespeak.net> Author: guido Date: Sat Jan 27 13:29:39 2007 New Revision: 37425 Modified: py/trunk/py/code/code.py py/trunk/py/code/testing/test_code.py Log: Fixed Code.__ne__() (wrong function sig, missing 'other' argument). Modified: py/trunk/py/code/code.py ============================================================================== --- py/trunk/py/code/code.py (original) +++ py/trunk/py/code/code.py Sat Jan 27 13:29:39 2007 @@ -15,7 +15,7 @@ def __eq__(self, other): return self.raw == other.raw - def __ne__(self): + def __ne__(self, other): return not self == other def new(self, rec=False, **kwargs): Modified: py/trunk/py/code/testing/test_code.py ============================================================================== --- py/trunk/py/code/testing/test_code.py (original) +++ py/trunk/py/code/testing/test_code.py Sat Jan 27 13:29:39 2007 @@ -8,6 +8,12 @@ newco = code.new() assert co == newco +def test_ne(): + code1 = py.code.Code(compile('foo = "bar"', '', 'exec')) + assert code1 == code1 + code2 = py.code.Code(compile('foo = "baz"', '', 'exec')) + assert code2 != code1 + def test_newcode_unknown_args(): code = py.code.Code(compile("", '', 'exec')) py.test.raises(TypeError, 'code.new(filename="hello")') From fijal at codespeak.net Sat Jan 27 14:02:18 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 27 Jan 2007 14:02:18 +0100 (CET) Subject: [py-svn] r37427 - in py/trunk/py/test/rsession: . testing Message-ID: <20070127130218.40ED61007D@code0.codespeak.net> Author: fijal Date: Sat Jan 27 14:01:58 2007 New Revision: 37427 Modified: py/trunk/py/test/rsession/rsession.py py/trunk/py/test/rsession/testing/test_lsession.py Log: Kill the last occurencies of pkgdir Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Sat Jan 27 14:01:58 2007 @@ -227,12 +227,11 @@ reporter, checkfun = self.wrap_reporter(reporter) reporter(report.TestStarted(sshhosts)) - pkgdir = self.getpkgdir(args[0]) colitems = self.config.getcolitems() reporter(report.RsyncFinished()) if runner is None: - runner = self.init_runner(pkgdir) + runner = self.init_runner() keyword = self.config.option.keyword @@ -245,10 +244,10 @@ if not self.config.option.nomagic: py.magic.revoke(assertion=1) - self.write_docs(pkgdir) + self.write_docs() return retval - def write_docs(self, pkgdir): + def write_docs(self): if self.config.option.apigen: from py.__.apigen.tracer.docstorage import DocStorageAccessor apigen = py.path.local(self.config.option.apigen).pyimport() @@ -259,7 +258,8 @@ capture = py.io.OutErrCapture() try: try: - apigen.build(pkgdir, DocStorageAccessor(self.docstorage)) + apigen.build(self.config.topdir, + DocStorageAccessor(self.docstorage)) except AttributeError: import traceback exc, e, tb = sys.exc_info() @@ -272,13 +272,13 @@ finally: capture.reset() - def init_runner(self, pkgdir): + def init_runner(self): if self.config.option.apigen: from py.__.apigen.tracer.tracer import Tracer, DocStorage module = py try: apigen = py.path.local(self.config.option.apigen).pyimport() - items = apigen.get_documentable_items(pkgdir) + items = apigen.get_documentable_items(self.config.topdir) if isinstance(items, dict): self.docstorage = DocStorage().from_dict(items) else: Modified: py/trunk/py/test/rsession/testing/test_lsession.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_lsession.py (original) +++ py/trunk/py/test/rsession/testing/test_lsession.py Sat Jan 27 14:01:58 2007 @@ -286,7 +286,7 @@ all = str(tmpdir) config = py.test.config._reparse(all.split(" ")) lsession = LSession(config) - assert lsession.init_runner(pkgdir) is opt_mapping[opt] + assert lsession.init_runner() is opt_mapping[opt] #tmpdir.dirpath().ensure("conftest.py").write(py.code.Source(""" #dist_boxing=True #""")) From hpk at codespeak.net Sat Jan 27 14:09:18 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 27 Jan 2007 14:09:18 +0100 (CET) Subject: [py-svn] r37428 - py/trunk/py/doc Message-ID: <20070127130918.4FB491007D@code0.codespeak.net> Author: hpk Date: Sat Jan 27 14:09:09 2007 New Revision: 37428 Modified: py/trunk/py/doc/TODO.txt Log: added a note about dist_rsyncroots semantics Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Sat Jan 27 14:09:09 2007 @@ -110,6 +110,14 @@ * cleanup initialisation of config / get rid of pkgdir * unify option names (dist_*) * (optional) see if more of py/test/session.py's Session can be reused +* have dist_rsyncroots be relative to the conftest.py file + so that projects can define it for themselves, e.g. + pypy/conftest.py would contain + dist_rsyncroots = ['../pypy', '../py'] + for this there probably needs to be a + config.getvalue_and_conftestpath() + method with tests and documentation, and with providing + the right example. code quality ----------------- From fijal at codespeak.net Sat Jan 27 14:12:41 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 27 Jan 2007 14:12:41 +0100 (CET) Subject: [py-svn] r37429 - py/trunk/py/test/rsession Message-ID: <20070127131241.292851007D@code0.codespeak.net> Author: fijal Date: Sat Jan 27 14:12:23 2007 New Revision: 37429 Modified: py/trunk/py/test/rsession/rsession.py Log: Ugh, revert. Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Sat Jan 27 14:12:23 2007 @@ -258,7 +258,8 @@ capture = py.io.OutErrCapture() try: try: - apigen.build(self.config.topdir, + pkgdir = self.getpkgdir(self.config.args[0]) + apigen.build(pkgdir, DocStorageAccessor(self.docstorage)) except AttributeError: import traceback @@ -277,8 +278,9 @@ from py.__.apigen.tracer.tracer import Tracer, DocStorage module = py try: + pkgdir = self.getpkgdir(self.config.args[0]) apigen = py.path.local(self.config.option.apigen).pyimport() - items = apigen.get_documentable_items(self.config.topdir) + items = apigen.get_documentable_items(pkgdir) if isinstance(items, dict): self.docstorage = DocStorage().from_dict(items) else: From guido at codespeak.net Sat Jan 27 14:20:58 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 14:20:58 +0100 (CET) Subject: [py-svn] r37430 - py/trunk/py/apigen/testing Message-ID: <20070127132058.3FD621007D@code0.codespeak.net> Author: guido Date: Sat Jan 27 14:20:56 2007 New Revision: 37430 Modified: py/trunk/py/apigen/testing/test_apigen_functional.py Log: Fixed test, was depending on dict order and values had changed. Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Sat Jan 27 14:20:56 2007 @@ -74,9 +74,9 @@ def test_get_documentable_items(): fs_root, package_name = setup_fs_project() documentable = apigen.get_documentable_items(fs_root.join(package_name)) - assert documentable.__package__.exportdefs.keys() == [ - 'main.sub.func', 'main.func', 'main.SomeTestSubClass', - 'main.SomeTestClass'] + assert sorted(documentable.__package__.exportdefs.keys()) == [ + 'main.SomeTestClass', 'main.SomeTestSubClass', 'main.func', + 'main.sub.func'] def test_apigen_functional(): fs_root, package_name = setup_fs_project() From guido at codespeak.net Sat Jan 27 14:26:58 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 14:26:58 +0100 (CET) Subject: [py-svn] r37431 - py/trunk/py/apigen/testing Message-ID: <20070127132658.903DE10075@code0.codespeak.net> Author: guido Date: Sat Jan 27 14:26:57 2007 New Revision: 37431 Modified: py/trunk/py/apigen/testing/test_apigen_functional.py Log: Fixed problem that made that the wrong package was imported when ran after test_apigen_example. Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Sat Jan 27 14:26:57 2007 @@ -6,16 +6,17 @@ import py from py.__.apigen import apigen -def setup_fs_project(): - temp = py.test.ensuretemp('apigen_functional') - temp.ensure("pkg/func.py").write(py.code.Source("""\ +def setup_fs_project(name): + temp = py.test.ensuretemp(name) + assert temp.listdir() == [] + temp.ensure("pak/func.py").write(py.code.Source("""\ def func(arg1): "docstring" def func_2(arg1, arg2): return arg1(arg2) """)) - temp.ensure('pkg/sometestclass.py').write(py.code.Source("""\ + temp.ensure('pak/sometestclass.py').write(py.code.Source("""\ class SomeTestClass(object): " docstring sometestclass " def __init__(self, somevar): @@ -25,20 +26,20 @@ " get_somevar docstring " return self.somevar """)) - temp.ensure('pkg/sometestsubclass.py').write(py.code.Source("""\ + temp.ensure('pak/sometestsubclass.py').write(py.code.Source("""\ from sometestclass import SomeTestClass class SomeTestSubClass(SomeTestClass): " docstring sometestsubclass " def get_somevar(self): return self.somevar + 1 """)) - temp.ensure('pkg/somenamespace.py').write(py.code.Source("""\ + temp.ensure('pak/somenamespace.py').write(py.code.Source("""\ def foo(): return 'bar' def baz(qux): return qux """)) - temp.ensure("pkg/__init__.py").write(py.code.Source("""\ + temp.ensure("pak/__init__.py").write(py.code.Source("""\ from py.initpkg import initpkg initpkg(__name__, exportdefs = { 'main.sub.func': ("./func.py", "func"), @@ -48,41 +49,41 @@ 'SomeTestSubClass'), }) """)) - temp.ensure('pkg/test/test_pkg.py').write(py.code.Source("""\ + temp.ensure('pak/test/test_pak.py').write(py.code.Source("""\ import py py.std.sys.path.insert(0, py.magic.autopath().dirpath().dirpath().dirpath().strpath) - import pkg + import pak # this mainly exists to provide some data to the tracer - def test_pkg(): - s = pkg.main.SomeTestClass(10) + def test_pak(): + s = pak.main.SomeTestClass(10) assert s.get_somevar() == 10 - s = pkg.main.SomeTestClass('10') + s = pak.main.SomeTestClass('10') assert s.get_somevar() == '10' - s = pkg.main.SomeTestSubClass(10) + s = pak.main.SomeTestSubClass(10) assert s.get_somevar() == 11 - s = pkg.main.SomeTestSubClass('10') + s = pak.main.SomeTestSubClass('10') py.test.raises(TypeError, 's.get_somevar()') - assert pkg.main.sub.func(10) is None - assert pkg.main.sub.func(20) is None - s = pkg.main.func(pkg.main.SomeTestClass, 10) - assert isinstance(s, pkg.main.SomeTestClass) + assert pak.main.sub.func(10) is None + assert pak.main.sub.func(20) is None + s = pak.main.func(pak.main.SomeTestClass, 10) + assert isinstance(s, pak.main.SomeTestClass) """)) - return temp, 'pkg' + return temp, 'pak' def test_get_documentable_items(): - fs_root, package_name = setup_fs_project() + fs_root, package_name = setup_fs_project('test_get_documentable_items') documentable = apigen.get_documentable_items(fs_root.join(package_name)) assert sorted(documentable.__package__.exportdefs.keys()) == [ 'main.SomeTestClass', 'main.SomeTestSubClass', 'main.func', 'main.sub.func'] def test_apigen_functional(): - fs_root, package_name = setup_fs_project() + fs_root, package_name = setup_fs_project('test_apigen_functional') tempdir = py.test.ensuretemp('test_apigen_functional_results') pydir = py.magic.autopath().dirpath().dirpath().dirpath() - pkgdir = fs_root.join('pkg') + pakdir = fs_root.join('pak') if py.std.sys.platform == 'win32': cmd = 'set APIGEN_TARGET=%s && python "%s/bin/py.test"' % (tempdir, pydir) @@ -91,7 +92,7 @@ try: output = py.process.cmdexec('%s --apigen="%s/apigen.py" "%s"' % ( cmd, pydir.join('apigen'), - pkgdir)) + pakdir)) except py.error.Error, e: print e.out raise From guido at codespeak.net Sat Jan 27 14:33:41 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 14:33:41 +0100 (CET) Subject: [py-svn] r37432 - py/trunk/py/doc Message-ID: <20070127133341.91A7410075@code0.codespeak.net> Author: guido Date: Sat Jan 27 14:33:40 2007 New Revision: 37432 Modified: py/trunk/py/doc/TODO.txt Log: Some updates on stuff I've worked on, fixed ReST. Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Sat Jan 27 14:33:40 2007 @@ -37,13 +37,14 @@ py.path.extpy -> py.path._extpy py.log -> py._log (pypy!) -* review py.io and write py.io.dupfile docstring (XXX guido) +* review py.io and write py.io.dupfile docstring + + (guido - added docstring, and code looks okay (what was the reason for the + review? anything specific?) * re-consider what to do with read and write methods of py.path classes (since there are places that check for file-ness by doing hasattr(... 'write')) - (XXX guido talk to holger) - packaging ------------------------------------- @@ -83,7 +84,9 @@ testing ----------- -* windows tests (rev 36514 passes without errors, many skips) (XXX guido) +* windows tests (rev 36514 passes without errors, many skips) + + (guido tested again, and fixed newly broken tests, all work again now) * these should all work on 0.9 and on the py lib and pypy: - running "py.test -s" @@ -91,6 +94,9 @@ - running "py.test --looponfailing" - running "py.test" distributed on some hosts + (guido tested all on win32, everything works except --dist (requires + os.fork to work)) + * see why startcapture() does not use FD-based "py.io.OutErrCapture" to isolate standard output. use that check if all py and PyPy tests pass @@ -112,10 +118,14 @@ * (optional) see if more of py/test/session.py's Session can be reused * have dist_rsyncroots be relative to the conftest.py file so that projects can define it for themselves, e.g. - pypy/conftest.py would contain + pypy/conftest.py would contain:: + dist_rsyncroots = ['../pypy', '../py'] - for this there probably needs to be a + + for this there probably needs to be a:: + config.getvalue_and_conftestpath() + method with tests and documentation, and with providing the right example. @@ -202,7 +212,6 @@ execnet.PopenGateway.__repr__ misses a docstring execnet.PopenGateway.__init__ misses a docstring initpkg misses a docstring - io.dupfile misses a docstring log.setconsumer misses a docstring log.get misses a docstring log.Syslog misses a docstring From fijal at codespeak.net Sat Jan 27 15:02:08 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 27 Jan 2007 15:02:08 +0100 (CET) Subject: [py-svn] r37433 - in py/trunk/py/test: . testing Message-ID: <20070127140208.C5AB310075@code0.codespeak.net> Author: fijal Date: Sat Jan 27 15:01:45 2007 New Revision: 37433 Modified: py/trunk/py/test/config.py py/trunk/py/test/conftesthandle.py py/trunk/py/test/testing/test_conftesthandle.py Log: Add a helper which returns value + path of a dir where value was found Modified: py/trunk/py/test/config.py ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py Sat Jan 27 15:01:45 2007 @@ -117,7 +117,14 @@ try: return self._overwrite_dict[name] except KeyError: - return self.conftest.rget(name, path) + return self.conftest.rget(name, path) + + def getvalue_and_confpath(self, name, path=None): + """ same as previous, but returns conftest's path + as well + """ + val, mod = self.conftest.rget_path(name, path) + return val, py.path.local(mod.__file__).dirpath() def initsession(self): """ return an initialized session object. """ Modified: py/trunk/py/test/conftesthandle.py ============================================================================== --- py/trunk/py/test/conftesthandle.py (original) +++ py/trunk/py/test/conftesthandle.py Sat Jan 27 15:01:45 2007 @@ -57,19 +57,24 @@ # return self._get(name, modules) def rget(self, name, path=None): + return self._rget(name, path)[0] + + def _rget(self, name, path=None): modules = self.getconftestmodules(path) modules.reverse() - return self._get(name, modules) + return self._get(name, modules) + + def rget_path(self, name, path=None): + return self._rget(name, path) def _get(self, name, modules): - for mod in modules: + for mod in modules: try: - return getattr(mod, name) + return getattr(mod, name), mod except AttributeError: continue raise KeyError, name - def importconfig(configpath): if not configpath.dirpath('__init__.py').check(file=1): # HACK: we don't want any "globally" imported conftest.py, Modified: py/trunk/py/test/testing/test_conftesthandle.py ============================================================================== --- py/trunk/py/test/testing/test_conftesthandle.py (original) +++ py/trunk/py/test/testing/test_conftesthandle.py Sat Jan 27 15:01:45 2007 @@ -65,6 +65,12 @@ #conftest.lget("a") == 1 #conftest.lget("b") == 1 + def test_value_access_path(self): + topdir = self.basedir.join("adir", "b") + conftest = Conftest(topdir) + _, mod = conftest.rget_path("a") + assert py.path.local(mod.__file__).dirpath() == topdir + class TestConftestValueAccessInPackage(TestConftestValueAccessGlobal): def setup_class(cls): TestConftestValueAccessGlobal.__dict__['setup_class'](cls) From guido at codespeak.net Sat Jan 27 15:11:55 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 15:11:55 +0100 (CET) Subject: [py-svn] r37434 - in py/trunk/py/rest: . testing Message-ID: <20070127141155.E30E210075@code0.codespeak.net> Author: guido Date: Sat Jan 27 15:11:52 2007 New Revision: 37434 Modified: py/trunk/py/rest/rst.py py/trunk/py/rest/testing/test_rst.py Log: Fixed bug in add() that made that the to-be-added item didn't get added (and yes, I've added a test now ): ), made some error message a bit clearer. Modified: py/trunk/py/rest/rst.py ============================================================================== --- py/trunk/py/rest/rst.py (original) +++ py/trunk/py/rest/rst.py Sat Jan 27 15:11:52 2007 @@ -79,6 +79,7 @@ returns a reference to the child """ + self._add(child) return child def _add(self, child): @@ -349,7 +350,8 @@ if self.rest is None: self.rest = self.find_rest() if self.rest.links.get(self._text, self.target) != self.target: - raise ValueError('link name already in use for a different target') + raise ValueError('link name %r already in use for a different ' + 'target' % (self.target,)) self.rest.links[self._text] = self.target return AbstractText.text(self) Modified: py/trunk/py/rest/testing/test_rst.py ============================================================================== --- py/trunk/py/rest/testing/test_rst.py (original) +++ py/trunk/py/rest/testing/test_rst.py Sat Jan 27 15:11:52 2007 @@ -88,7 +88,7 @@ txt = Strong('bar').text() assert txt == '**bar**' -def test_text_join(): +def test_text_multiple_arguments(): txt = Paragraph(Text("dupa"), Text("dupa")).text() assert txt == "dupa dupa" @@ -97,6 +97,12 @@ txt = txt.join(Text("happen at sea"), Text("you know")) assert txt.text() == "worse things happen at sea you know" +def test_text_add(): + p = Paragraph(Text('grmbl')) + p2 = p.add(Text('grmbl too')) + assert p2.text() == 'grmbl too' + assert p.text() == 'grmbl grmbl too' + def test_paragraph_basic(): txt = Paragraph(Text('spam')).text() assert txt == 'spam' From guido at codespeak.net Sat Jan 27 15:29:20 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 15:29:20 +0100 (CET) Subject: [py-svn] r37435 - py/trunk/py/test Message-ID: <20070127142920.A558810075@code0.codespeak.net> Author: guido Date: Sat Jan 27 15:29:17 2007 New Revision: 37435 Modified: py/trunk/py/test/conftesthandle.py Log: Removing debug print (ended up in the ReST). Modified: py/trunk/py/test/conftesthandle.py ============================================================================== --- py/trunk/py/test/conftesthandle.py (original) +++ py/trunk/py/test/conftesthandle.py Sat Jan 27 15:29:17 2007 @@ -26,7 +26,7 @@ for arg in args + [current]: anchor = current.join(arg, abs=1) if anchor.check(): # we found some file object - print "initializing conftest from", anchor + #print "initializing conftest from", anchor # conftest-lookups without a path actually mean # lookups with our initial path. self._path2confmods[None] = self.getconftestmodules(anchor) From guido at codespeak.net Sat Jan 27 16:36:23 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 16:36:23 +0100 (CET) Subject: [py-svn] r37437 - in py/trunk/py/rest: . testing Message-ID: <20070127153623.DE24410068@code0.codespeak.net> Author: guido Date: Sat Jan 27 16:36:20 2007 New Revision: 37437 Modified: py/trunk/py/rest/rst.py py/trunk/py/rest/testing/test_rst.py Log: Made stuff a bit more robust by converting non-strings to strings in some places. Modified: py/trunk/py/rest/rst.py ============================================================================== --- py/trunk/py/rest/rst.py (original) +++ py/trunk/py/rest/rst.py Sat Jan 27 16:36:20 2007 @@ -15,6 +15,8 @@ def escape(txt): """escape ReST markup""" + if not isinstance(txt, str) and not isinstance(txt, unicode): + txt = str(txt) # XXX this takes a very naive approach to escaping, but it seems to be # sufficient... for c in '\\*`|:_': @@ -231,6 +233,8 @@ return self.start + text + self.end def escape(self, text): + if not isinstance(text, str) and not isinstance(text, unicode): + text = str(text) if self.start: text = text.replace(self.start, '\\%s' % (self.start,)) if self.end and self.end != self.start: Modified: py/trunk/py/rest/testing/test_rst.py ============================================================================== --- py/trunk/py/rest/testing/test_rst.py (original) +++ py/trunk/py/rest/testing/test_rst.py Sat Jan 27 16:36:20 2007 @@ -429,16 +429,25 @@ def test_title_following_links_empty_line(): expected = """\ -Foo, bar and `baz`_. - -.. _`baz`: http://www.baz.com +Foo, bar and `baz`_ Spam ----- +==== Spam, eggs and spam. + +.. _`baz`: http://www.baz.com + """ txt = Rest(Paragraph("Foo, bar and ", Link("baz", "http://www.baz.com")), - Title('Spam'), Paragraph('Spam, eggs and spam.')) + Title('Spam'), Paragraph('Spam, eggs and spam.')).text() + assert txt == expected checkrest(txt) +def test_nonstring_text(): + expected = """\ +/foo/bar.py +""" + txt = Rest(Paragraph(Text(py.path.local('/foo/bar.py')))).text() + assert txt == expected + From guido at codespeak.net Sat Jan 27 16:37:45 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 16:37:45 +0100 (CET) Subject: [py-svn] r37438 - in py/trunk/py/test: . rsession rsession/testing Message-ID: <20070127153745.A7FBC10068@code0.codespeak.net> Author: guido Date: Sat Jan 27 16:37:43 2007 New Revision: 37438 Modified: py/trunk/py/test/conftesthandle.py py/trunk/py/test/rsession/outcome.py py/trunk/py/test/rsession/rest.py py/trunk/py/test/rsession/testing/test_rest.py Log: Fiddle-fixed --rest, although it works now some cleanups would be nice... Cleaned up the tests a bit and re-enabled some (sucky tests are better than no tests at all, I guess... :| ), re-enabled a debug print after complaints from cfbolz ;) but this time it prints to stderr (to avoid ReST pollution). Modified: py/trunk/py/test/conftesthandle.py ============================================================================== --- py/trunk/py/test/conftesthandle.py (original) +++ py/trunk/py/test/conftesthandle.py Sat Jan 27 16:37:43 2007 @@ -26,7 +26,7 @@ for arg in args + [current]: anchor = current.join(arg, abs=1) if anchor.check(): # we found some file object - #print "initializing conftest from", anchor + print >>py.std.sys.stderr, "initializing conftest from", anchor # conftest-lookups without a path actually mean # lookups with our initial path. self._path2confmods[None] = self.getconftestmodules(anchor) Modified: py/trunk/py/test/rsession/outcome.py ============================================================================== --- py/trunk/py/test/rsession/outcome.py (original) +++ py/trunk/py/test/rsession/outcome.py Sat Jan 27 16:37:43 2007 @@ -27,7 +27,10 @@ tb_info = [self.traceback_entry_repr(x, tbstyle) for x in excinfo.traceback] rec_index = excinfo.traceback.recursionindex() - return (excinfo.type.__name__, str(excinfo.value), (tb_info, rec_index)) + etype = excinfo.type + if hasattr(etype, '__name__'): + etype = etype.__name__ + return (etype, str(excinfo.value), (tb_info, rec_index)) def traceback_entry_repr(self, tb_entry, tb_style): lineno = tb_entry.lineno Modified: py/trunk/py/test/rsession/rest.py ============================================================================== --- py/trunk/py/test/rsession/rest.py (original) +++ py/trunk/py/test/rsession/rest.py Sat Jan 27 16:37:43 2007 @@ -140,7 +140,10 @@ self.add_rest(ListItem('%s: %s' % (item, text))) def get_host(self, event): - return event.channel.gateway.host + try: + return event.channel.gateway.host + except AttributeError: + return None def failures(self): self.traceback_num = 0 @@ -160,7 +163,8 @@ t.add(Link(itempath, link)) else: t.add(Text(itempath)) - t.add(Text('on %s' % (host.hostname,))) + if host: + t.add(Text('on %s' % (host.hostname,))) self.add_rest(t) if event.outcome.signal: self.repr_signal(event.item, event.outcome) Modified: py/trunk/py/test/rsession/testing/test_rest.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_rest.py (original) +++ py/trunk/py/test/rsession/testing/test_rest.py Sat Jan 27 16:37:43 2007 @@ -11,6 +11,11 @@ from py.__.test.rsession.hostmanage import HostInfo from py.__.test.rsession.outcome import Outcome +class Container(object): + def __init__(self, **args): + for arg, val in args.items(): + setattr(self, arg, val) + class RestTestReporter(RestReporter): def __init__(self, *args, **kwargs): if args: @@ -78,11 +83,6 @@ def listnames(self): return ['package', 'foo', 'bar.py'] - class Container(object): - def __init__(self, **args): - for arg, val in args.items(): - setattr(self, arg, val) - parent = Container(parent=None, fspath=py.path.local('.')) event = report.ItemStart(item=FakeModule(parent)) reporter.report(event) @@ -105,11 +105,6 @@ def test_ReceivedItemOutcome_PASSED(self): outcome = Outcome() - class Container(object): - def __init__(self, **args): - for arg, val in args.items(): - setattr(self, arg, val) - item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz']) event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, item=item) reporter.report(event) @@ -117,11 +112,6 @@ 'foo.py/bar()/baz\n\n') def test_ReceivedItemOutcome_SKIPPED(self): - class Container(object): - def __init__(self, **args): - for arg, val in args.items(): - setattr(self, arg, val) - outcome = Outcome(skipped="reason") item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz']) event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, item=item) @@ -130,11 +120,6 @@ 'foo.py/bar()/baz\n\n') def test_ReceivedItemOutcome_FAILED(self): - class Container(object): - def __init__(self, **args): - for arg, val in args.items(): - setattr(self, arg, val) - outcome = Outcome(excinfo="xxx") item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz']) event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, item=item) @@ -143,13 +128,45 @@ * localhost\: **FAILED** `traceback0`_ foo.py/bar()/baz """ - - def test_skips(self): - class Container(object): - def __init__(self, **args): - for arg, val in args.items(): - setattr(self, arg, val) + def test_ReceivedItemOutcome_FAILED_stdout(self): + excinfo = Container( + typename='FooError', + value='A foo has occurred', + traceback=[ + Container( + path='foo/bar.py', + lineno=1, + relline=1, + source='foo()', + ), + Container( + path='foo/baz.py', + lineno=4, + relline=1, + source='raise FooError("A foo has occurred")', + ), + ] + ) + outcome = Outcome(excinfo=excinfo) + outcome.stdout = '' + outcome.stderr = '' + parent = Container(parent=None, fspath=py.path.local('.')) + item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz'], + parent=parent, fspath=py.path.local('foo')) + event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, + item=item) + reporter.report(event) + reporter.timestart = 10 + reporter.timeend = 20 + reporter.timersync = 15 + reporter.print_summary(10, '', '') + + reporter.print_summary(1, 'skipped', 'failed') + out = stdout.getvalue() + assert out.find('') > -1 + + def test_skips(self): class FakeOutcome(Container, report.ReceivedItemOutcome): pass @@ -175,12 +192,6 @@ """ def test_failures(self): - py.test.skip("This one is totally artificial, needs to be rewritten") - class Container(object): - def __init__(self, **args): - for arg, val in args.items(): - setattr(self, arg, val) - class FakeOutcome(Container, report.ReceivedItemOutcome): pass From guido at codespeak.net Sat Jan 27 16:40:26 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 16:40:26 +0100 (CET) Subject: [py-svn] r37439 - py/trunk/py/test Message-ID: <20070127154026.B7CEA10068@code0.codespeak.net> Author: guido Date: Sat Jan 27 16:40:25 2007 New Revision: 37439 Modified: py/trunk/py/test/conftesthandle.py Log: Sorry, cfbolz, seems the print to stderr breaks some test... :| Modified: py/trunk/py/test/conftesthandle.py ============================================================================== --- py/trunk/py/test/conftesthandle.py (original) +++ py/trunk/py/test/conftesthandle.py Sat Jan 27 16:40:25 2007 @@ -26,7 +26,7 @@ for arg in args + [current]: anchor = current.join(arg, abs=1) if anchor.check(): # we found some file object - print >>py.std.sys.stderr, "initializing conftest from", anchor + #print >>py.std.sys.stderr, "initializing conftest from", anchor # conftest-lookups without a path actually mean # lookups with our initial path. self._path2confmods[None] = self.getconftestmodules(anchor) From fijal at codespeak.net Sat Jan 27 18:33:45 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 27 Jan 2007 18:33:45 +0100 (CET) Subject: [py-svn] r37442 - py/trunk/py/doc Message-ID: <20070127173345.7E60910075@code0.codespeak.net> Author: fijal Date: Sat Jan 27 18:33:41 2007 New Revision: 37442 Modified: py/trunk/py/doc/TODO.txt Log: update Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Sat Jan 27 18:33:41 2007 @@ -102,18 +102,21 @@ use that check if all py and PyPy tests pass as good as they do without. -* make --box run on the trunk +* make --box run on the trunk. This requires having some sort of + is_boxed() function, while having it on config object seems + to be not that smart idea. * (DONE more or less) try to be as 2.2 compatible as possible (use e.g. py.builtin.enumerate instead of "enumerate" directly) -* have all sessions check their options via Session.fixoptions() - and have session-particular tests and checks accordingly. +* (DONE for rsession) have all sessions check their options via + Session.fixoptions() and have session-particular tests and checks + accordingly. distributed testing / RSession ------------------------------------ -* cleanup initialisation of config / get rid of pkgdir +* (DONE, except apigen) cleanup initialisation of config / get rid of pkgdir * unify option names (dist_*) * (optional) see if more of py/test/session.py's Session can be reused * have dist_rsyncroots be relative to the conftest.py file From hpk at codespeak.net Sat Jan 27 19:41:41 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 27 Jan 2007 19:41:41 +0100 (CET) Subject: [py-svn] r37443 - py/trunk/py/test/terminal Message-ID: <20070127184141.3078810075@code0.codespeak.net> Author: hpk Date: Sat Jan 27 19:41:39 2007 New Revision: 37443 Modified: py/trunk/py/test/terminal/remote.py Log: slightly re-organizing RemoteTerminalSession for easier subclassing. Modified: py/trunk/py/test/terminal/remote.py ============================================================================== --- py/trunk/py/test/terminal/remote.py (original) +++ py/trunk/py/test/terminal/remote.py Sat Jan 27 19:41:39 2007 @@ -90,30 +90,40 @@ print "# ", "^" * len(str(rootdir)) return failures - def run_remote_session(self, failures): + def _initslavegateway(self): print "* opening PopenGateway: ", self.executable - gw = py.execnet.PopenGateway(self.executable) + topdir = self.config.topdir + return py.execnet.PopenGateway(self.executable), topdir + + def run_remote_session(self, failures): + gw, topdir = self._initslavegateway() channel = gw.remote_exec(""" from py.__.test.terminal.remote import slaverun_TerminalSession slaverun_TerminalSession(channel) """, stdout=self.out, stderr=self.out) - print "MASTER: triggered slave terminal session ->" + print "MASTER: initiated slave terminal session ->" repr = self.config.make_repr(conftestnames=[]) - channel.send((str(self.config.topdir), repr, failures)) - print "MASTER: send start info" + channel.send((str(topdir), repr, failures)) + print "MASTER: send start info, topdir=%s" % (topdir,) try: return channel.receive() except channel.RemoteError, e: + print "*" * 70 + print "ERROR while waiting for proper slave startup" + print "*" * 70 print e return [] def slaverun_TerminalSession(channel): """ we run this on the other side. """ - print "SLAVE: starting" + print "SLAVE: initializing ..." topdir, repr, failures = channel.receive() - print "SLAVE: received configuration" + print "SLAVE: received configuration, using topdir:", topdir config = py.test.config + import sys + sys.stdout.flush() config.initdirect(topdir, repr, failures) + config.option.session = None config.option.looponfailing = False config.option.usepdb = False config.option.executable = None From hpk at codespeak.net Sat Jan 27 19:57:07 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 27 Jan 2007 19:57:07 +0100 (CET) Subject: [py-svn] r37444 - py/trunk/py/execnet/script Message-ID: <20070127185707.6AC9B10068@code0.codespeak.net> Author: hpk Date: Sat Jan 27 19:57:05 2007 New Revision: 37444 Added: py/trunk/py/execnet/script/loop_socketserver.py Modified: py/trunk/py/execnet/script/socketserver.py Log: a try at a wrapping loop_socketserver.py that restarts the actual socketserver.py Added: py/trunk/py/execnet/script/loop_socketserver.py ============================================================================== --- (empty file) +++ py/trunk/py/execnet/script/loop_socketserver.py Sat Jan 27 19:57:05 2007 @@ -0,0 +1,12 @@ + +import os, sys + +if __name__ == '__main__': + directory = os.path.dirname(os.path.abspath(sys.argv[0])) + script = os.path.join(directory, 'socketserver.py') + while 1: + cmd = "python %s %s" % (script, " ".join(sys.argv[1:])) + print "starting subcommand:", cmd + f = os.popen(cmd) + for line in f: + print line, Modified: py/trunk/py/execnet/script/socketserver.py ============================================================================== --- py/trunk/py/execnet/script/socketserver.py (original) +++ py/trunk/py/execnet/script/socketserver.py Sat Jan 27 19:57:05 2007 @@ -53,8 +53,8 @@ old = fcntl.fcntl(serversock.fileno(), fcntl.F_GETFD) fcntl.fcntl(serversock.fileno(), fcntl.F_SETFD, old | fcntl.FD_CLOEXEC) # allow the address to be re-used in a reasonable amount of time - if os.name == 'posix' and sys.platform != 'cygwin': - serversock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + #if os.name == 'posix' and sys.platform != 'cygwin': + serversock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) serversock.bind(hostport) serversock.listen(5) @@ -83,5 +83,5 @@ else: hostport = ':8888' serversock = bind_and_listen(hostport) - startserver(serversock, loop=True) + startserver(serversock, loop=False) From hpk at codespeak.net Sat Jan 27 20:13:23 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 27 Jan 2007 20:13:23 +0100 (CET) Subject: [py-svn] r37445 - py/trunk/py/execnet/script Message-ID: <20070127191323.00B2D10071@code0.codespeak.net> Author: hpk Date: Sat Jan 27 20:13:17 2007 New Revision: 37445 Modified: py/trunk/py/execnet/script/loop_socketserver.py Log: use suprocess module to start socketserver subprocess Modified: py/trunk/py/execnet/script/loop_socketserver.py ============================================================================== --- py/trunk/py/execnet/script/loop_socketserver.py (original) +++ py/trunk/py/execnet/script/loop_socketserver.py Sat Jan 27 20:13:17 2007 @@ -1,12 +1,13 @@ import os, sys +import subprocess if __name__ == '__main__': directory = os.path.dirname(os.path.abspath(sys.argv[0])) script = os.path.join(directory, 'socketserver.py') while 1: - cmd = "python %s %s" % (script, " ".join(sys.argv[1:])) - print "starting subcommand:", cmd - f = os.popen(cmd) - for line in f: - print line, + cmdlist = ["python", script] + cmdlist.extend(sys.argv[1:]) + print "starting subcommand:", " ".join(cmdlist) + process = subprocess.Popen(cmdlist) + process.wait() From hpk at codespeak.net Sat Jan 27 20:22:25 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 27 Jan 2007 20:22:25 +0100 (CET) Subject: [py-svn] r37446 - py/trunk/py/execnet/script Message-ID: <20070127192225.682B810071@code0.codespeak.net> Author: hpk Date: Sat Jan 27 20:22:23 2007 New Revision: 37446 Modified: py/trunk/py/execnet/script/socketserver.py Log: don't try this on windows Modified: py/trunk/py/execnet/script/socketserver.py ============================================================================== --- py/trunk/py/execnet/script/socketserver.py (original) +++ py/trunk/py/execnet/script/socketserver.py Sat Jan 27 20:22:23 2007 @@ -53,8 +53,8 @@ old = fcntl.fcntl(serversock.fileno(), fcntl.F_GETFD) fcntl.fcntl(serversock.fileno(), fcntl.F_SETFD, old | fcntl.FD_CLOEXEC) # allow the address to be re-used in a reasonable amount of time - #if os.name == 'posix' and sys.platform != 'cygwin': - serversock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + if os.name == 'posix' and sys.platform != 'cygwin': + serversock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) serversock.bind(hostport) serversock.listen(5) From hpk at codespeak.net Sat Jan 27 20:24:42 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 27 Jan 2007 20:24:42 +0100 (CET) Subject: [py-svn] r37447 - py/trunk/py/test/testing Message-ID: <20070127192442.B04EF10071@code0.codespeak.net> Author: hpk Date: Sat Jan 27 20:24:41 2007 New Revision: 37447 Modified: py/trunk/py/test/testing/test_repr.py Log: config._reparse() from current dir can drag in conftest.py files (happened to me because i had two py lib checkouts) Modified: py/trunk/py/test/testing/test_repr.py ============================================================================== --- py/trunk/py/test/testing/test_repr.py (original) +++ py/trunk/py/test/testing/test_repr.py Sat Jan 27 20:24:41 2007 @@ -5,12 +5,18 @@ from StringIO import StringIO import sys +def newconfig(*args): + tmpdir = py.test.ensuretemp("newconfig") + args = list(args) + args.append(tmpdir) + return py.test.config._reparse(args) + def test_repr_source(): source = py.code.Source(""" def f(x): pass """).strip() - config = py.test.config._reparse([]) + config = newconfig() s = StringIO() out = getout(s) p = Presenter(out, config) @@ -32,7 +38,7 @@ except: e = py.code.ExceptionInfo() return e - config = py.test.config._reparse([]) + config = newconfig() s = StringIO() out = getout(s) p = Presenter(out, config) @@ -42,7 +48,7 @@ assert s.getvalue().startswith("> ") def test_repr_local(): - config = py.test.config._reparse(['--showlocals']) + config = newconfig('--showlocals') s = StringIO() out = getout(s) p = Presenter(out, config) From hpk at codespeak.net Sat Jan 27 21:11:34 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 27 Jan 2007 21:11:34 +0100 (CET) Subject: [py-svn] r37449 - py/trunk/py/doc Message-ID: <20070127201134.1437410071@code0.codespeak.net> Author: hpk Date: Sat Jan 27 21:11:26 2007 New Revision: 37449 Modified: py/trunk/py/doc/conftest.py Log: fix failures in case of docutils not being installed (related to importing 'py.__.rest.directive') Modified: py/trunk/py/doc/conftest.py ============================================================================== --- py/trunk/py/doc/conftest.py (original) +++ py/trunk/py/doc/conftest.py Sat Jan 27 21:11:26 2007 @@ -1,7 +1,6 @@ from __future__ import generators import py from py.__.misc import rest -from py.__.rest import directive Option = py.test.config.Option option = py.test.config.addoptions("documentation check options", @@ -15,11 +14,18 @@ ) ) +_initialized = False def checkdocutils(): + global _initialized try: import docutils except ImportError: py.test.skip("docutils not importable") + if not _initialized: + from py.__.rest import directive + directive.register_linkrole('api', resolve_linkrole) + directive.register_linkrole('source', resolve_linkrole) + _initialized = True def restcheck(path): localpath = path @@ -251,6 +257,4 @@ else: relpath += '.html' return text, '../../apigen/source/%s' % (relpath,) -directive.register_linkrole('api', resolve_linkrole) -directive.register_linkrole('source', resolve_linkrole) From hpk at codespeak.net Sat Jan 27 21:15:25 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sat, 27 Jan 2007 21:15:25 +0100 (CET) Subject: [py-svn] r37450 - py/trunk/py/misc/testing Message-ID: <20070127201525.B58BD10071@code0.codespeak.net> Author: hpk Date: Sat Jan 27 21:15:21 2007 New Revision: 37450 Modified: py/trunk/py/misc/testing/test_initpkg.py Log: skip auto-import checks of directive.py because it requires docutils Modified: py/trunk/py/misc/testing/test_initpkg.py ============================================================================== --- py/trunk/py/misc/testing/test_initpkg.py (original) +++ py/trunk/py/misc/testing/test_initpkg.py Sat Jan 27 21:15:21 2007 @@ -57,6 +57,7 @@ base.join('path', 'extpy', 'testing', 'test_data'), base.join('path', 'gateway',), base.join('doc',), + base.join('rest', 'directive.py'), base.join('test', 'testing', 'import_test'), base.join('c-extension',), base.join('magic', 'greenlet.py'), From guido at codespeak.net Sat Jan 27 23:50:51 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Sat, 27 Jan 2007 23:50:51 +0100 (CET) Subject: [py-svn] r37453 - py/trunk/py/rest/testing Message-ID: <20070127225051.1E54F10071@code0.codespeak.net> Author: guido Date: Sat Jan 27 23:50:49 2007 New Revision: 37453 Modified: py/trunk/py/rest/testing/test_rst.py Log: Changed test a bit to avoid issues on non-UNIX platforms. Modified: py/trunk/py/rest/testing/test_rst.py ============================================================================== --- py/trunk/py/rest/testing/test_rst.py (original) +++ py/trunk/py/rest/testing/test_rst.py Sat Jan 27 23:50:49 2007 @@ -446,8 +446,11 @@ def test_nonstring_text(): expected = """\ -/foo/bar.py + """ - txt = Rest(Paragraph(Text(py.path.local('/foo/bar.py')))).text() + class FooBar(object): + def __str__(self): + return '' + txt = Rest(Paragraph(Text(FooBar()))).text() assert txt == expected From hpk at codespeak.net Sun Jan 28 09:46:36 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 09:46:36 +0100 (CET) Subject: [py-svn] r37455 - py/trunk/py/misc Message-ID: <20070128084636.853A810068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 09:46:34 2007 New Revision: 37455 Added: py/trunk/py/misc/conftest-socketgatewayrun.py Log: added a sample conftest.py to run windows tests remotely, note the module docstring. Added: py/trunk/py/misc/conftest-socketgatewayrun.py ============================================================================== --- (empty file) +++ py/trunk/py/misc/conftest-socketgatewayrun.py Sun Jan 28 09:46:34 2007 @@ -0,0 +1,58 @@ +""" + +Put this file as 'conftest.py' somewhere upwards from py-trunk, +modify the "socketserveradr" below to point to a windows/linux +host running "py/execnet/script/loop_socketserver.py" +and invoke e.g. from linux: + + py.test --session=MySession some_path_to_what_you_want_to_test + +This should ad-hoc distribute the running of tests to +the remote machine (including rsyncing your WC). + +""" +import py +from py.__.test.terminal.remote import RemoteTerminalSession + +import os + +class MyRSync(py.execnet.RSync): + def filter(self, path): + if path.endswith('.pyc') or path.endswith('~'): + return False + dir, base = os.path.split(path) + # we may want to have revision info on the other side, + # so let's not exclude .svn directories + #if base == '.svn': + # return False + return True + +class MySession(RemoteTerminalSession): + socketserveradr = ('10.9.4.148', 8888) + + def _initslavegateway(self): + print "MASTER: initializing remote socket gateway" + gw = py.execnet.SocketGateway(*self.socketserveradr) + rsync = MyRSync(delete=True) + channel = gw.remote_exec(""" + import os + path = os.path.join(os.environ['HOMEPATH'], 'pytestcache') + channel.send(path) + """) + remotetopdir = channel.receive() + rsync.add_target(gw, remotetopdir) + sendpath = py.path.local(py.__file__).dirpath().dirpath() + rsync.send(sendpath) + channel = gw.remote_exec(""" + import os, sys + path = %r # os.path.abspath + sys.path.insert(0, path) + os.chdir(path) + import py + channel.send((path, py.__file__)) + """ % remotetopdir) + topdir, remotepypath = channel.receive() + assert topdir == remotetopdir, (topdir, remotetopdir) + assert remotepypath.startswith(topdir), (remotepypath, topdir) + #print "remote side has rsynced pythonpath ready: %r" %(topdir,) + return gw, topdir From hpk at codespeak.net Sun Jan 28 09:49:00 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 09:49:00 +0100 (CET) Subject: [py-svn] r37456 - py/trunk/py/execnet Message-ID: <20070128084900.64A1B10068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 09:48:59 2007 New Revision: 37456 Modified: py/trunk/py/execnet/gateway.py py/trunk/py/execnet/register.py Log: some small adjustments/cleanups regarding intiialisation Modified: py/trunk/py/execnet/gateway.py ============================================================================== --- py/trunk/py/execnet/gateway.py (original) +++ py/trunk/py/execnet/gateway.py Sun Jan 28 09:48:59 2007 @@ -55,12 +55,16 @@ addr = '[%s]' % (addr,) else: addr = '' - r = (len(self.pool.getstarted('receiver')) - and "receiving" or "not receiving") - s = (len(self.pool.getstarted('sender')) - and "sending" or "not sending") - i = len(self.channelfactory.channels()) - return "<%s%s %s/%s (%d active channels)>" %( + try: + r = (len(self.pool.getstarted('receiver')) + and "receiving" or "not receiving") + s = (len(self.pool.getstarted('sender')) + and "sending" or "not sending") + i = len(self.channelfactory.channels()) + except AttributeError: + r = s = "uninitialized" + i = "no" + return "<%s%s %s/%s (%s active channels)>" %( self.__class__.__name__, addr, r, s, i) def _getremoteaddress(self): Modified: py/trunk/py/execnet/register.py ============================================================================== --- py/trunk/py/execnet/register.py (original) +++ py/trunk/py/execnet/register.py Sun Jan 28 09:48:59 2007 @@ -40,7 +40,7 @@ gateway starts with odd numbers. This allows to uniquely identify channels across both sides. """ - bootstrap = ["we_are_remote=True", extra] + bootstrap = [extra] bootstrap += [getsource(x) for x in startup_modules] bootstrap += [io.server_stmt, "Gateway(io=io, startcount=2).join(joinexec=False)",] source = "\n".join(bootstrap) @@ -135,7 +135,7 @@ self.port = port = int(port) sock.connect((host, port)) io = inputoutput.SocketIO(sock) - InstallableGateway.__init__(self, io=io) + super(SocketGateway, self).__init__(io=io) def _getremoteaddress(self): return '%s:%d' % (self.host, self.port) From hpk at codespeak.net Sun Jan 28 09:49:29 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 09:49:29 +0100 (CET) Subject: [py-svn] r37457 - py/trunk/py/test/terminal Message-ID: <20070128084929.F004110071@code0.codespeak.net> Author: hpk Date: Sun Jan 28 09:49:28 2007 New Revision: 37457 Modified: py/trunk/py/test/terminal/remote.py Log: explicitely shutdown the gateway for the remote session after each run. Modified: py/trunk/py/test/terminal/remote.py ============================================================================== --- py/trunk/py/test/terminal/remote.py (original) +++ py/trunk/py/test/terminal/remote.py Sun Jan 28 09:49:28 2007 @@ -101,18 +101,21 @@ from py.__.test.terminal.remote import slaverun_TerminalSession slaverun_TerminalSession(channel) """, stdout=self.out, stderr=self.out) - print "MASTER: initiated slave terminal session ->" - repr = self.config.make_repr(conftestnames=[]) - channel.send((str(topdir), repr, failures)) - print "MASTER: send start info, topdir=%s" % (topdir,) try: - return channel.receive() - except channel.RemoteError, e: - print "*" * 70 - print "ERROR while waiting for proper slave startup" - print "*" * 70 - print e - return [] + print "MASTER: initiated slave terminal session ->" + repr = self.config.make_repr(conftestnames=[]) + channel.send((str(topdir), repr, failures)) + print "MASTER: send start info, topdir=%s" % (topdir,) + try: + return channel.receive() + except channel.RemoteError, e: + print "*" * 70 + print "ERROR while waiting for proper slave startup" + print "*" * 70 + print e + return [] + finally: + gw.exit() def slaverun_TerminalSession(channel): """ we run this on the other side. """ From hpk at codespeak.net Sun Jan 28 10:07:24 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 10:07:24 +0100 (CET) Subject: [py-svn] r37458 - py/trunk/py/misc Message-ID: <20070128090724.5BD7410064@code0.codespeak.net> Author: hpk Date: Sun Jan 28 10:07:22 2007 New Revision: 37458 Modified: py/trunk/py/misc/conftest-socketgatewayrun.py Log: try to only rsync the py lib, not the dirpath() of it Modified: py/trunk/py/misc/conftest-socketgatewayrun.py ============================================================================== --- py/trunk/py/misc/conftest-socketgatewayrun.py (original) +++ py/trunk/py/misc/conftest-socketgatewayrun.py Sun Jan 28 10:07:22 2007 @@ -34,14 +34,16 @@ print "MASTER: initializing remote socket gateway" gw = py.execnet.SocketGateway(*self.socketserveradr) rsync = MyRSync(delete=True) + pkgname = 'py' # xxx flexibilize channel = gw.remote_exec(""" import os - path = os.path.join(os.environ['HOMEPATH'], 'pytestcache') - channel.send(path) - """) - remotetopdir = channel.receive() - rsync.add_target(gw, remotetopdir) - sendpath = py.path.local(py.__file__).dirpath().dirpath() + topdir = os.path.join(os.environ['HOMEPATH'], 'pytestcache') + pkgdir = os.path.join(topdir, %r) + channel.send((topdir, pkgdir)) + """ % (pkgname,)) + remotetopdir, remotepkgdir = channel.receive() + rsync.add_target(gw, remotepkgdir) + sendpath = py.path.local(py.__file__).dirpath() rsync.send(sendpath) channel = gw.remote_exec(""" import os, sys From hpk at codespeak.net Sun Jan 28 11:14:24 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 11:14:24 +0100 (CET) Subject: [py-svn] r37459 - in py/trunk/py/execnet: . testing Message-ID: <20070128101424.27C9C10068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 11:14:22 2007 New Revision: 37459 Modified: py/trunk/py/execnet/register.py py/trunk/py/execnet/testing/test_gateway.py Log: fix socketgateway test to run on both win32 and linux Modified: py/trunk/py/execnet/register.py ============================================================================== --- py/trunk/py/execnet/register.py (original) +++ py/trunk/py/execnet/register.py Sun Jan 28 11:14:22 2007 @@ -145,7 +145,7 @@ given gateway. """ if hostport is None: - host, port = ('', 0) + host, port = ('', 0) # XXX works on all platforms? else: host, port = hostport socketserverbootstrap = py.code.Source( @@ -153,18 +153,16 @@ """ import socket sock = bind_and_listen((%r, %r)) - hostname = socket.gethostname() - channel.send((hostname, sock.getsockname())) + port = sock.getsockname() + channel.send(port) startserver(sock) """ % (host, port)) # execute the above socketserverbootstrap on the other side channel = gateway.remote_exec(socketserverbootstrap) - hostname, (realhost, realport) = channel.receive() - if not hostname: - hostname = realhost + (realhost, realport) = channel.receive() #gateway._trace("remote_install received" # "port=%r, hostname = %r" %(realport, hostname)) - return py.execnet.SocketGateway(hostname, realport) + return py.execnet.SocketGateway(host, realport) remote_install = classmethod(remote_install) class SshGateway(PopenCmdGateway): Modified: py/trunk/py/execnet/testing/test_gateway.py ============================================================================== --- py/trunk/py/execnet/testing/test_gateway.py (original) +++ py/trunk/py/execnet/testing/test_gateway.py Sun Jan 28 11:14:22 2007 @@ -437,7 +437,9 @@ def setup_class(cls): # open a gateway to a fresh child process cls.proxygw = py.execnet.PopenGateway() - cls.gw = py.execnet.SocketGateway.remote_install(cls.proxygw) + cls.gw = py.execnet.SocketGateway.remote_install(cls.proxygw, + ("127.0.0.1", 0) + ) ## def teardown_class(cls): ## cls.gw.exit() From hpk at codespeak.net Sun Jan 28 11:32:02 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 11:32:02 +0100 (CET) Subject: [py-svn] r37460 - py/trunk/py/test/rsession/testing Message-ID: <20070128103202.1AAD710068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 11:32:01 2007 New Revision: 37460 Modified: py/trunk/py/test/rsession/testing/test_reporter.py Log: these tests rely on exact formatting, so skipping them again (fail for me on pypy2) Modified: py/trunk/py/test/rsession/testing/test_reporter.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_reporter.py (original) +++ py/trunk/py/test/rsession/testing/test_reporter.py Sun Jan 28 11:32:01 2007 @@ -202,7 +202,7 @@ self._test_still_to_go() def test_report_received_item_outcome(self): - #py.test.skip("XXX rewrite test to not rely on exact formatting") + py.test.skip("XXX rewrite test to not rely on exact formatting") val = self.report_received_item_outcome() expected = """ localhost: FAILED py.test.rsession.testing.test_slave.py funcpass localhost: SKIPPED py.test.rsession.testing.test_slave.py funcpass @@ -212,6 +212,7 @@ assert val.find(expected) != -1 def test_module(self): + py.test.skip("XXX rewrite test to not rely on exact formatting") val = self._test_module() print val expected = """ localhost: FAILED py.test.rsession.testing.test_slave.py funcpass From hpk at codespeak.net Sun Jan 28 11:42:14 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 11:42:14 +0100 (CET) Subject: [py-svn] r37461 - py/trunk/py/apigen/testing Message-ID: <20070128104214.B474F10068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 11:42:13 2007 New Revision: 37461 Modified: py/trunk/py/apigen/testing/test_apigen_example.py Log: skip these tests on windows (some reliances on unix-paths and i don't think apigen can run on windows anyway at the moment) Modified: py/trunk/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_example.py (original) +++ py/trunk/py/apigen/testing/test_apigen_example.py Sun Jan 28 11:42:13 2007 @@ -8,6 +8,10 @@ from py.__.test.web import webcheck from py.__.apigen.conftest import option +def setup_module(mod): + if py.std.sys.platform == "win32": + py.test.skip("apigen does not fully support win32 yet") + def run_string_sequence_test(data, seq): currpos = -1 for s in seq: From hpk at codespeak.net Sun Jan 28 12:00:19 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 12:00:19 +0100 (CET) Subject: [py-svn] r37462 - in py/trunk/py/test: . terminal Message-ID: <20070128110019.F1A3010068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 12:00:17 2007 New Revision: 37462 Modified: py/trunk/py/test/config.py py/trunk/py/test/terminal/remote.py Log: allow the remote side to run in verbose mode Modified: py/trunk/py/test/config.py ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py Sun Jan 28 12:00:17 2007 @@ -226,6 +226,7 @@ class override: def __init__(self, d): self.__dict__.update(d) + self.__file__ = "" args, conftestdict, cmdlineopts = repr self.args = [self.topdir.join(x) for x in args] self.conftest.setinitial(self.args) Modified: py/trunk/py/test/terminal/remote.py ============================================================================== --- py/trunk/py/test/terminal/remote.py (original) +++ py/trunk/py/test/terminal/remote.py Sun Jan 28 12:00:17 2007 @@ -130,6 +130,8 @@ config.option.looponfailing = False config.option.usepdb = False config.option.executable = None + if failures: + config.option.verbose = True session = config.initsession() session.shouldclose = channel.isclosed From hpk at codespeak.net Sun Jan 28 12:02:21 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 12:02:21 +0100 (CET) Subject: [py-svn] r37463 - py/trunk/py/apigen/tracer/testing Message-ID: <20070128110221.0C6DD10063@code0.codespeak.net> Author: hpk Date: Sun Jan 28 12:02:19 2007 New Revision: 37463 Modified: py/trunk/py/apigen/tracer/testing/test_docgen.py Log: test_get_initpkg_star_items() fails for me when run as part of the whole py lib tests, succeeds when ran as a single test. Pruning sys.modules fixes this (but i am not sure why the tracer depends on seeing the import happen) Modified: py/trunk/py/apigen/tracer/testing/test_docgen.py ============================================================================== --- py/trunk/py/apigen/tracer/testing/test_docgen.py (original) +++ py/trunk/py/apigen/tracer/testing/test_docgen.py Sun Jan 28 12:02:19 2007 @@ -415,6 +415,11 @@ def setup_pkg_docstorage(): pkgdir, pkgname = setup_fs_project() py.std.sys.path.insert(0, str(pkgdir)) + # XXX test_get_initpkg_star_items depends on package not + # being imported already + for key in py.std.sys.modules.keys(): + if key == pkgname or key.startswith(pkgname + "."): + del py.std.sys.modules[key] pkg = __import__(pkgname) ds = DocStorage().from_pkg(pkg) return pkg, ds From hpk at codespeak.net Sun Jan 28 14:25:07 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 14:25:07 +0100 (CET) Subject: [py-svn] r37465 - in py/trunk/py/test: . rsession terminal testing Message-ID: <20070128132507.AC1FE10068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 14:25:03 2007 New Revision: 37465 Added: py/trunk/py/test/testing/test_remote.py - copied, changed from r37463, py/trunk/py/test/testing/test_session.py Modified: py/trunk/py/test/config.py py/trunk/py/test/rsession/rsession.py py/trunk/py/test/session.py py/trunk/py/test/terminal/remote.py py/trunk/py/test/testing/setupdata.py py/trunk/py/test/testing/test_config.py py/trunk/py/test/testing/test_session.py Log: * all Sessions now have fixoptions() * added some tests for implied and conflicting options * make all Session objects inherit from the base session * small cleanups with respect to test setup * separate tests a bit Modified: py/trunk/py/test/config.py ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py Sun Jan 28 14:25:03 2007 @@ -48,7 +48,6 @@ args = [str(x) for x in args] cmdlineoption, args = self._parser.parse_args(args) self.option.__dict__.update(vars(cmdlineoption)) - fixoptions(self.option) # XXX fixing should be moved to sessions if not args: args.append(py.std.os.getcwd()) self.topdir = gettopdir(args) @@ -130,9 +129,7 @@ """ return an initialized session object. """ cls = self._getsessionclass() session = cls(self) - # XXX: all sessions should have one - if hasattr(session, 'fixoptions'): - session.fixoptions() + session.fixoptions() return session def _getsessionclass(self): @@ -272,28 +269,6 @@ except ValueError: raise ValueError("%s=%r is not marshallable" %(name, value)) -def fixoptions(option): - """ sanity checks and making option values canonical. """ - - # implied options - if option.usepdb: - if not option.nocapture: - #print "--pdb implies --nocapture" - option.nocapture = True - - if option.runbrowser and not option.startserver: - #print "--runbrowser implies --startserver" - option.startserver = True - - # conflicting options - if option.looponfailing and option.usepdb: - raise ValueError, "--looponfailing together with --pdb not supported." - if option.looponfailing and option.dist: - raise ValueError, "--looponfailing together with --dist not supported." - if option.executable and option.usepdb: - raise ValueError, "--exec together with --pdb not supported." - - def gettopdir(args): """ return the top directory for the given paths. if the common base dir resides in a python package Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Sun Jan 28 14:25:03 2007 @@ -16,15 +16,23 @@ from py.__.test.rsession.local import local_loop, plain_runner, apigen_runner,\ box_runner from py.__.test.rsession.reporter import LocalReporter, RemoteReporter +from py.__.test.session import Session -class AbstractSession(object): +class AbstractSession(Session): """ An abstract session executes collectors/items through a runner. """ def __init__(self, config, optimise_localhost=True): - self.config = config + super(AbstractSession, self).__init__(config=config) self.optimise_localhost = optimise_localhost + + def fixoptions(self): + option = self.config.option + if option.runbrowser and not option.startserver: + #print "--runbrowser implies --startserver" + option.startserver = True + super(AbstractSession, self).fixoptions() def getpkgdir(path): path = py.path.local(path) @@ -122,6 +130,7 @@ """ Remote version of session """ def fixoptions(self): + super(RSession, self).fixoptions() config = self.config try: config.getvalue('disthosts') Modified: py/trunk/py/test/session.py ============================================================================== --- py/trunk/py/test/session.py (original) +++ py/trunk/py/test/session.py Sun Jan 28 14:25:03 2007 @@ -23,6 +23,21 @@ if not self.config.option.nomagic: py.magic.revoke(assertion=1) + def fixoptions(self): + """ check, fix and determine conflicting options. """ + option = self.config.option + # 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." + if option.looponfailing and option.dist: + raise ValueError, "--looponfailing together with --dist not supported." + if option.executable and option.usepdb: + raise ValueError, "--exec together with --pdb not supported." + def start(self, colitem): """ hook invoked before each colitem.run() invocation. """ Modified: py/trunk/py/test/terminal/remote.py ============================================================================== --- py/trunk/py/test/terminal/remote.py (original) +++ py/trunk/py/test/terminal/remote.py Sun Jan 28 14:25:03 2007 @@ -1,7 +1,7 @@ from __future__ import generators import py +from py.__.test.session import Session from py.__.test.terminal.out import getout -import sys def checkpyfilechange(rootdir, statcache={}): """ wait until project files are changed. """ @@ -51,9 +51,9 @@ l.append(current) return l -class RemoteTerminalSession(object): +class RemoteTerminalSession(Session): def __init__(self, config, file=None): - self.config = config + super(RemoteTerminalSession, self).__init__(config=config) self._setexecutable() if file is None: file = py.std.sys.stdout @@ -123,8 +123,6 @@ topdir, repr, failures = channel.receive() print "SLAVE: received configuration, using topdir:", topdir config = py.test.config - import sys - sys.stdout.flush() config.initdirect(topdir, repr, failures) config.option.session = None config.option.looponfailing = False Modified: py/trunk/py/test/testing/setupdata.py ============================================================================== --- py/trunk/py/test/testing/setupdata.py (original) +++ py/trunk/py/test/testing/setupdata.py Sun Jan 28 14:25:03 2007 @@ -1,13 +1,20 @@ import py +def setup_module(mod): + mod.datadir = setupdatadir() + mod.tmpdir = py.test.ensuretemp(mod.__name__) + def setupdatadir(): datadir = py.test.ensuretemp("datadir") - if not datadir.listdir(): - for name, content in namecontent: + names = [x.basename for x in datadir.listdir()] + for name, content in namecontent: + if name not in names: datadir.join(name).write(content) return datadir namecontent = [ +('syntax_error.py', "this is really not python\n"), + ('disabled_module.py', py.code.Source(''' disabled = True Modified: py/trunk/py/test/testing/test_config.py ============================================================================== --- py/trunk/py/test/testing/test_config.py (original) +++ py/trunk/py/test/testing/test_config.py Sun Jan 28 14:25:03 2007 @@ -231,7 +231,8 @@ def test_sessionname_lookup_custom(self): self.tmpdir.join("conftest.py").write(py.code.Source(""" - class MySession: + from py.__.test.session import Session + class MySession(Session): def __init__(self, config): self.config = config """)) @@ -357,3 +358,4 @@ col3 = config._getcollector(config.topdir.dirpath()) py.test.raises(ValueError, "config.get_collector_trail(col3)") + Copied: py/trunk/py/test/testing/test_remote.py (from r37463, py/trunk/py/test/testing/test_session.py) ============================================================================== --- py/trunk/py/test/testing/test_session.py (original) +++ py/trunk/py/test/testing/test_remote.py Sun Jan 28 14:25:03 2007 @@ -1,316 +1,7 @@ import py -from setupdata import setupdatadir - -def setup_module(mod): - mod.datadir = setupdatadir() - mod.tmpdir = py.test.ensuretemp(mod.__name__) - -def test_default_session_options(): - for opts in ([], ['-l'], ['-s'], ['--tb=no'], ['--tb=short'], - ['--tb=long'], ['--fulltrace'], ['--nomagic'], - ['--traceconfig'], ['-v'], ['-v', '-v']): - yield runfiletest, opts - -def runfiletest(opts): - config = py.test.config._reparse(opts + [datadir/'filetest.py']) - session = config.initsession() - session.main() - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 2 - l = session.getitemoutcomepairs(py.test.Item.Passed) - assert not l - -class TestKeywordSelection: - def test_select_simple(self): - for keyword in ['test_one', 'est_on']: - config = py.test.config._reparse([datadir/'filetest.py', - '-k', keyword]) - session = config._getsessionclass()(config, py.std.sys.stdout) - session.main() - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 1 - item = l[0][0] - assert item.name == 'test_one' - l = session.getitemoutcomepairs(py.test.Item.Skipped) - assert len(l) == 1 - - def test_select_extra_keywords(self): - o = tmpdir.ensure('selecttest', dir=1) - tfile = o.join('test_select.py').write(py.code.Source(""" - def test_1(): - pass - class TestClass: - def test_2(self): - pass - """)) - conftest = o.join('conftest.py').write(py.code.Source(""" - import py - class Class(py.test.collect.Class): - def haskeyword(self, keyword): - return keyword == 'xxx' or \ - super(Class, self).haskeyword(keyword) - """)) - for keyword in ('xxx', 'xxx test_2', 'TestClass', 'xxx -test_1', - 'TestClass test_2', 'xxx TestClass test_2',): - f = py.std.StringIO.StringIO() - config = py.test.config._reparse([o, '-k', keyword]) - session = config._getsessionclass()(config, f) - session.main() - print "keyword", repr(keyword) - l = session.getitemoutcomepairs(py.test.Item.Passed) - assert len(l) == 1 - assert l[0][0].name == 'test_2' - l = session.getitemoutcomepairs(py.test.Item.Skipped) - assert l[0][0].name == 'test_1' - -#f = open('/tmp/logfile', 'wa') -class TestTerminalSession: - - def setup_class(cls): - (datadir / 'syntax_error.py').write("\nthis is really not python\n") - - def teardown_class(cls): - (datadir / 'syntax_error.py').remove() - - def mainsession(self, *args): - from py.__.test.terminal.terminal import TerminalSession - self.file = py.std.StringIO.StringIO() - config = py.test.config._reparse(list(args)) - session = TerminalSession(config, file=self.file) - session.main() - return session - - def test_terminal(self): - session = self.mainsession(datadir / 'filetest.py') - out = self.file.getvalue() - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 2 - assert out.find('2 failed') != -1 - - def test_syntax_error_module(self): - session = self.mainsession(datadir / 'syntax_error.py') - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 1 - out = self.file.getvalue() - assert out.find(str('syntax_error.py')) != -1 - assert out.find(str('not python')) != -1 - - def test_exit_first_problem(self): - session = self.mainsession("--exitfirst", - datadir / 'filetest.py') - assert session.config.option.exitfirst - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 1 - l = session.getitemoutcomepairs(py.test.Item.Passed) - assert not l - - def test_collectonly(self): - session = self.mainsession("--collectonly", - datadir / 'filetest.py') - assert session.config.option.collectonly - out = self.file.getvalue() - #print out - l = session.getitemoutcomepairs(py.test.Item.Failed) - #if l: - # x = l[0][1].excinfo - # print x.exconly() - # print x.traceback - assert len(l) == 0 - for line in ('filetest.py', 'test_one', - 'TestClass', 'test_method_one'): - assert out.find(line) - - def test_recursion_detection(self): - o = tmpdir.ensure('recursiontest', dir=1) - tfile = o.join('test_recursion.py') - tfile.write(py.code.Source(""" - def test_1(): - def f(): - g() - def g(): - f() - f() - """)) - session = self.mainsession(o) - print "back from main", o - out = self.file.getvalue() - #print out - i = out.find('Recursion detected') - assert i != -1 - - def test_generator_yields_None(self): - o = tmpdir.ensure('generatornonetest', dir=1) - tfile = o.join('test_generatornone.py') - tfile.write(py.code.Source(""" - def test_1(): - yield None - """)) - session = self.mainsession(o) - out = self.file.getvalue() - #print out - i = out.find('TypeError') - assert i != -1 - - def test_capturing_hooks_simple(self): - o = tmpdir.ensure('capturing', dir=1) - tfile = o.join('test_capturing.py').write(py.code.Source(""" - import py - print "module level output" - def test_capturing(): - print 42 - print >>py.std.sys.stderr, 23 - def test_capturing_error(): - print 1 - print >>py.std.sys.stderr, 2 - raise ValueError - """)) - conftest = o.join('conftest.py').write(py.code.Source(""" - import py - class Function(py.test.Function): - def startcapture(self): - self._mycapture = py.io.OutErrCapture() - - def finishcapture(self): - self._testmycapture = self._mycapture.reset() - """)) - session = self.mainsession(o) - l = session.getitemoutcomepairs(py.test.Item.Passed) - assert len(l) == 1 - item = l[0][0] - assert hasattr(item, '_testmycapture') - print item._testmycapture - out, err = item._testmycapture - assert int(out.strip()) == 42 - assert int(err.strip()) == 23 - - assert isinstance(item.parent, py.test.collect.Module) - out, err = item.parent.getouterr() - assert out.find('module level output') != -1 - allout = self.file.getvalue() - print "allout:", allout - assert allout.find('module level output') != -1, ( - "session didn't show module output") - - def test_raises_output(self): - o = tmpdir.ensure('raisestest', dir=1) - tfile = o.join('test_raisesoutput.py') - tfile.write(py.code.Source(""" - import py - def test_raises_doesnt(): - py.test.raises(ValueError, int, "3") - """)) - session = self.mainsession(o) - out = self.file.getvalue() - if not out.find("DID NOT RAISE") != -1: - print out - py.test.fail("incorrect raises() output") - - def test_order_of_execution(self): - o = tmpdir.ensure('ordertest', dir=1) - tfile = o.join('test_orderofexecution.py') - tfile.write(py.code.Source(""" - l = [] - def test_1(): - l.append(1) - def test_2(): - l.append(2) - def test_3(): - assert l == [1,2] - class Testmygroup: - reslist = l - def test_1(self): - self.reslist.append(1) - def test_2(self): - self.reslist.append(2) - def test_3(self): - self.reslist.append(3) - def test_4(self): - assert self.reslist == [1,2,1,2,3] - """)) - - session = self.mainsession(o) - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 0 - l = session.getitemoutcomepairs(py.test.Item.Passed) - assert len(l) == 7 - # also test listnames() here ... - item, result = l[-1] - assert item.name == 'test_4' - names = item.listnames() - assert names == ['ordertest', 'test_orderofexecution.py', 'Testmygroup', '()', 'test_4'] - - def test_nested_import_error(self): - o = tmpdir.ensure('Ians_importfailure', dir=1) - tfile = o.join('test_import_fail.py') - tfile.write(py.code.Source(""" - import import_fails - def test_this(): - assert import_fails.a == 1 - """)) - o.join('import_fails.py').write(py.code.Source(""" - import does_not_work - a = 1 - """)) - session = self.mainsession(o) - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 1 - item, outcome = l[0] - assert str(outcome.excinfo).find('does_not_work') != -1 - - def test_safe_repr(self): - session = self.mainsession(datadir/'brokenrepr.py') - out = self.file.getvalue() - print 'Output of simulated "py.test brokenrepr.py":' - print out - - l = session.getitemoutcomepairs(py.test.Item.Failed) - assert len(l) == 2 - assert out.find("""[Exception("Ha Ha fooled you, I'm a broken repr().") raised in repr()]""") != -1 #' - assert out.find("[unknown exception raised in repr()]") != -1 - - def test_E_on_correct_line(self): - o = tmpdir.ensure('E_on_correct_line', dir=1) - tfile = o.join('test_correct_line.py') - source = py.code.Source(""" - import py - def test_hello(): - assert (None == - ['a', - 'b', - 'c']) - """) - tfile.write(source) - session = self.mainsession(o) - out = self.file.getvalue() - print 'Output of simulated "py.test test_correct_line.py":' - print out - i = out.find('test_correct_line.py:') - assert i >= 0 - linenum = int(out[i+len('test_correct_line.py:')]) # a single char - line_to_report = source[linenum-1] - expected_output = '\nE ' + line_to_report + '\n' - print 'Looking for:', expected_output - assert expected_output in out - +from py.__.test.testing.setupdata import setup_module class TestRemote: - def XXXtest_rootdir_is_package(self): - d = tmpdir.ensure('rootdirtest1', dir=1) - d.ensure('__init__.py') - x1 = d.ensure('subdir', '__init__.py') - x2 = d.ensure('subdir2', '__init__.py') - x3 = d.ensure('subdir3', 'noinit', '__init__.py') - assert getrootdir([x1]) == d - assert getrootdir([x2]) == d - assert getrootdir([x1,x2]) == d - assert getrootdir([x3,x2]) == d - assert getrootdir([x2,x3]) == d - - def XXXtest_rootdir_is_not_package(self): - one = tmpdir.ensure('rootdirtest1', 'hello') - rootdir = getrootdir([one]) - assert rootdir == one.dirpath() - def test_exec(self): o = tmpdir.ensure('remote', dir=1) tfile = o.join('test_exec.py') Modified: py/trunk/py/test/testing/test_session.py ============================================================================== --- py/trunk/py/test/testing/test_session.py (original) +++ py/trunk/py/test/testing/test_session.py Sun Jan 28 14:25:03 2007 @@ -1,9 +1,38 @@ import py -from setupdata import setupdatadir +from setupdata import setup_module # sets up global 'tmpdir' -def setup_module(mod): - mod.datadir = setupdatadir() - mod.tmpdir = py.test.ensuretemp(mod.__name__) +implied_options = { + '--pdb': 'usepdb and nocapture', + '-v': 'verbose', + '-l': 'showlocals', + '--runbrowser': 'startserver and runbrowser', +} + +conflict_options = ('--looponfailing --pdb', + '--dist --pdb', + '--exec=%s --pdb' % py.std.sys.executable, + ) + +def test_conflict_options(): + for spec in conflict_options: + opts = spec.split() + yield check_conflict_option, opts + +def check_conflict_option(opts): + print "testing if options conflict:", " ".join(opts) + config = py.test.config._reparse(opts + [datadir/'filetest.py']) + py.test.raises((ValueError, SystemExit), """ + config.initsession() + """) + +def test_implied_options(): + for key, expr in implied_options.items(): + yield check_implied_option, [key], expr + +def check_implied_option(opts, expr): + config = py.test.config._reparse(opts + [datadir/'filetest.py']) + session = config.initsession() + assert eval(expr, session.config.option.__dict__) def test_default_session_options(): for opts in ([], ['-l'], ['-s'], ['--tb=no'], ['--tb=short'], @@ -63,15 +92,7 @@ l = session.getitemoutcomepairs(py.test.Item.Skipped) assert l[0][0].name == 'test_1' -#f = open('/tmp/logfile', 'wa') class TestTerminalSession: - - def setup_class(cls): - (datadir / 'syntax_error.py').write("\nthis is really not python\n") - - def teardown_class(cls): - (datadir / 'syntax_error.py').remove() - def mainsession(self, *args): from py.__.test.terminal.terminal import TerminalSession self.file = py.std.StringIO.StringIO() @@ -291,72 +312,3 @@ expected_output = '\nE ' + line_to_report + '\n' print 'Looking for:', expected_output assert expected_output in out - - -class TestRemote: - def XXXtest_rootdir_is_package(self): - d = tmpdir.ensure('rootdirtest1', dir=1) - d.ensure('__init__.py') - x1 = d.ensure('subdir', '__init__.py') - x2 = d.ensure('subdir2', '__init__.py') - x3 = d.ensure('subdir3', 'noinit', '__init__.py') - assert getrootdir([x1]) == d - assert getrootdir([x2]) == d - assert getrootdir([x1,x2]) == d - assert getrootdir([x3,x2]) == d - assert getrootdir([x2,x3]) == d - - def XXXtest_rootdir_is_not_package(self): - one = tmpdir.ensure('rootdirtest1', 'hello') - rootdir = getrootdir([one]) - assert rootdir == one.dirpath() - - def test_exec(self): - o = tmpdir.ensure('remote', dir=1) - tfile = o.join('test_exec.py') - tfile.write(py.code.Source(""" - def test_1(): - assert 1 == 0 - """)) - print py.std.sys.executable - config = py.test.config._reparse( - ['--exec=' + py.std.sys.executable, - o]) - cls = config._getsessionclass() - out = [] # out = py.std.Queue.Queue() - session = cls(config, out.append) - session.main() - for s in out: - if s.find('1 failed') != -1: - break - else: - py.test.fail("did not see test_1 failure") - - def test_looponfailing(self): - o = tmpdir.ensure('looponfailing', dir=1) - tfile = o.join('test_looponfailing.py') - tfile.write(py.code.Source(""" - def test_1(): - assert 1 == 0 - """)) - print py.std.sys.executable - config = py.test.config._reparse(['--looponfailing', str(o)]) - cls = config._getsessionclass() - out = py.std.Queue.Queue() - session = cls(config, out.put) - pool = py._thread.WorkerPool() - reply = pool.dispatch(session.main) - while 1: - s = out.get(timeout=1.0) - if s.find('1 failed') != -1: - break - print s - else: - py.test.fail("did not see test_1 failure") - # XXX we would like to have a cleaner way to finish - try: - reply.get(timeout=0.5) - except IOError, e: - assert str(e).lower().find('timeout') != -1 - - From cfbolz at codespeak.net Sun Jan 28 17:34:52 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 28 Jan 2007 17:34:52 +0100 (CET) Subject: [py-svn] r37477 - py/trunk/py/rest Message-ID: <20070128163452.E610310068@code0.codespeak.net> Author: cfbolz Date: Sun Jan 28 17:34:52 2007 New Revision: 37477 Modified: py/trunk/py/rest/latex.py Log: use relative paths to try to make the py-lib both work in paths that have quotable characters _and_ with some versions of latex that don't like quotes in \input. let's see whether it works... Modified: py/trunk/py/rest/latex.py ============================================================================== --- py/trunk/py/rest/latex.py (original) +++ py/trunk/py/rest/latex.py Sun Jan 28 17:34:52 2007 @@ -122,7 +122,7 @@ if stylesheet is not None: sty = path.join(stylesheet) if sty.check(): - options.append('--stylesheet="%s"' % (sty, )) + options.append('--stylesheet=%s' % (sty.relto(f), )) options.append(f.new(basename=tex)) options = map(str, options) if rest_options is not None: From hpk at codespeak.net Sun Jan 28 17:56:44 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 17:56:44 +0100 (CET) Subject: [py-svn] r37478 - py/trunk/py/path/svn/testing Message-ID: <20070128165644.962F810068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 17:56:42 2007 New Revision: 37478 Modified: py/trunk/py/path/svn/testing/svntestbase.py py/trunk/py/path/svn/testing/test_urlcommand.py Log: refactored/streamlined tests slightly i think svn testing needs some more refinements (not before 0.9) Modified: py/trunk/py/path/svn/testing/svntestbase.py ============================================================================== --- py/trunk/py/path/svn/testing/svntestbase.py (original) +++ py/trunk/py/path/svn/testing/svntestbase.py Sun Jan 28 17:56:42 2007 @@ -103,13 +103,14 @@ res = url.info() assert res.size > len("samplefile") and res.created_rev >= 0 - def xxxtest_info_log(self): + def test_log_simple(self): + py.test.skip("XXX: does not work at least on svn below 1.3") url = self.root.join("samplefile") - res = url.log(rev_start=1155, rev_end=1155, verbose=True) - assert res[0].revision == 1155 and res[0].author == "jum" - from time import gmtime - t = gmtime(res[0].date) - assert t.tm_year == 2003 and t.tm_mon == 7 and t.tm_mday == 17 + logentries = url.log() + for logentry in logentries: + assert logentry.rev == 1 + assert hasattr(logentry, 'author') + assert hasattr(logentry, 'date') class CommonCommandAndBindingTests(CommonSvnTests): def test_trailing_slash_is_stripped(self): Modified: py/trunk/py/path/svn/testing/test_urlcommand.py ============================================================================== --- py/trunk/py/path/svn/testing/test_urlcommand.py (original) +++ py/trunk/py/path/svn/testing/test_urlcommand.py Sun Jan 28 17:56:42 2007 @@ -5,9 +5,9 @@ import datetime import time - -if py.path.local.sysfind('svn') is None: - py.test.skip("cannot test py.path.svn, 'svn' binary not found") +def setup_module(mod): + if py.path.local.sysfind('svn') is None: + py.test.skip("cannot test py.path.svn, 'svn' binary not found") class TestSvnCommandPath(CommonCommandAndBindingTests): def setup_class(cls): @@ -32,6 +32,9 @@ def test_svnurl_characters_colon_port(self): py.path.svnurl("http://host.com:8080/some/dir") + def test_svnurl_characters_tilde_end(self): + py.path.svnurl("http://host.com/some/file~") + def test_svnurl_characters_colon_path(self): if py.std.sys.platform == 'win32': # colons are allowed on win32, because they're part of the drive @@ -39,24 +42,6 @@ # other parts, I think py.test.skip('XXX fixme win32') py.test.raises(ValueError, 'py.path.svnurl("http://host.com/foo:bar")') - - def test_svnurl_characters_tilde_end(self): - py.path.svnurl("http://host.com/some/file~") - - # XXX - def xtest_copy_file(self): - raise py.test.Skipped(msg="XXX fix svnurl first") - - def xtest_copy_dir(self): - py.test.skipp("XXX fix svnurl first") - - def XXXtest_info_log(self): - url = self.root.join("samplefile") - res = url.log(rev_start=1155, rev_end=1155, verbose=True) - assert res[0].revision == 1155 and res[0].author == "jum" - from time import gmtime - t = gmtime(res[0].date) - assert t.tm_year == 2003 and t.tm_mon == 7 and t.tm_mday == 17 class TestSvnInfoCommand: From cfbolz at codespeak.net Sun Jan 28 18:16:43 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 28 Jan 2007 18:16:43 +0100 (CET) Subject: [py-svn] r37481 - py/trunk/py/rest Message-ID: <20070128171643.ADBFD10068@code0.codespeak.net> Author: cfbolz Date: Sun Jan 28 18:16:43 2007 New Revision: 37481 Modified: py/trunk/py/rest/latex.py Log: new attempt :-( Modified: py/trunk/py/rest/latex.py ============================================================================== --- py/trunk/py/rest/latex.py (original) +++ py/trunk/py/rest/latex.py Sun Jan 28 18:16:43 2007 @@ -122,7 +122,7 @@ if stylesheet is not None: sty = path.join(stylesheet) if sty.check(): - options.append('--stylesheet=%s' % (sty.relto(f), )) + options.append('--stylesheet=%s' % (sty.relto(f.dirpath()), )) options.append(f.new(basename=tex)) options = map(str, options) if rest_options is not None: From hpk at codespeak.net Sun Jan 28 18:53:46 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 18:53:46 +0100 (CET) Subject: [py-svn] r37494 - in py/trunk/py/test: . testing Message-ID: <20070128175346.313AB10079@code0.codespeak.net> Author: hpk Date: Sun Jan 28 18:53:43 2007 New Revision: 37494 Added: py/trunk/py/test/host.py py/trunk/py/test/testing/test_host.py Log: the start of factoring out common and unified host handling within py.test Added: py/trunk/py/test/host.py ============================================================================== --- (empty file) +++ py/trunk/py/test/host.py Sun Jan 28 18:53:43 2007 @@ -0,0 +1,37 @@ + +class InvalidHostSpec(ValueError): + pass + +def parsehostspec(spec): + parts = spec.split(":", 2) + if len(parts) < 2: + raise InvalidHostSpec(spec) + type = parts.pop(0) + if type == 'ssh': + sshaddress = parts.pop(0) + basedir = parts and ":".join(parts) or '' + return SpecSSH(sshaddress, basedir) + elif type == 'socket': + host = parts.pop(0) + if not parts: + raise InvalidHostSpec(spec) + remainder = parts.pop(0) + parts = remainder.split(":", 1) + port = int(parts.pop(0)) + basedir = parts and ":".join(parts) or '' + return SpecSocket(host, port, basedir) + else: + raise InvalidHostSpec(spec) + +class SpecSSH(object): + def __init__(self, sshaddress, basedir): + self.sshaddress = sshaddress + self.basedir = basedir + self.host = sshaddress.split('@', 1)[-1] + +class SpecSocket(object): + def __init__(self, host, port, basedir): + self.host = host + self.port = port + self.basedir = basedir + Added: py/trunk/py/test/testing/test_host.py ============================================================================== --- (empty file) +++ py/trunk/py/test/testing/test_host.py Sun Jan 28 18:53:43 2007 @@ -0,0 +1,56 @@ +""" + +Testing Host setup and rsyncing operations. + +""" + +import py +from py.__.test.host import parsehostspec + +def test_parse_hostspec_ssh(): + hostspec = parsehostspec("ssh:xyz at domain.net:directory") + assert hostspec.host == "domain.net" + assert hostspec.basedir == "directory" + assert hostspec.sshaddress == "xyz at domain.net" + + hostspec = parsehostspec("ssh:xyz at domain.net:direc:tory") + assert hostspec.host == "domain.net" + assert hostspec.basedir == "direc:tory" + assert hostspec.sshaddress == "xyz at domain.net" + + hostspec = parsehostspec("ssh:xyz at domain.net") + assert hostspec.host == "domain.net" + assert hostspec.basedir == "" + assert hostspec.sshaddress == "xyz at domain.net" + + hostspec = parsehostspec("ssh:domain.net:directory") + assert hostspec.host == "domain.net" + assert hostspec.basedir == "directory" + assert hostspec.sshaddress == "domain.net" + + hostspec = parsehostspec("ssh:domain.net:/tmp/hello") + assert hostspec.host == "domain.net" + assert hostspec.basedir == "/tmp/hello" + assert hostspec.sshaddress == "domain.net" + +def test_parse_hostspec_socket(): + hostspec = parsehostspec("socket:domain.net:1234:directory") + assert hostspec.host == "domain.net" + assert hostspec.port == 1234 + assert hostspec.basedir == "directory" + + hostspec = parsehostspec("socket:domain.net:1234") + assert hostspec.host == "domain.net" + assert hostspec.port == 1234 + assert hostspec.basedir == "" + +def test_parse_hostspec_error(): + py.test.raises(ValueError, """ + parsehostspec('alksd:qweqwe') + """) + py.test.raises(ValueError, """ + parsehostspec('ssh') + """) + py.test.raises(ValueError, """ + parsehostspec('socket:qweqwe') + """) From hpk at codespeak.net Sun Jan 28 21:09:05 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 21:09:05 +0100 (CET) Subject: [py-svn] r37498 - py/trunk/py/misc Message-ID: <20070128200905.38C8710068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 21:09:02 2007 New Revision: 37498 Modified: py/trunk/py/misc/conftest-socketgatewayrun.py Log: bah, my local config but i want to have it committed to get rid of the "M" state, ehem. Modified: py/trunk/py/misc/conftest-socketgatewayrun.py ============================================================================== --- py/trunk/py/misc/conftest-socketgatewayrun.py (original) +++ py/trunk/py/misc/conftest-socketgatewayrun.py Sun Jan 28 21:09:02 2007 @@ -29,6 +29,7 @@ class MySession(RemoteTerminalSession): socketserveradr = ('10.9.4.148', 8888) + socketserveradr = ('10.9.2.62', 8888) def _initslavegateway(self): print "MASTER: initializing remote socket gateway" From hpk at codespeak.net Sun Jan 28 21:25:16 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 21:25:16 +0100 (CET) Subject: [py-svn] r37499 - py/trunk/py/test/rsession Message-ID: <20070128202516.7687B10068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 21:25:11 2007 New Revision: 37499 Modified: py/trunk/py/test/rsession/rsession.py Log: concreter error message Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Sun Jan 28 21:25:11 2007 @@ -261,8 +261,8 @@ from py.__.apigen.tracer.docstorage import DocStorageAccessor apigen = py.path.local(self.config.option.apigen).pyimport() if not hasattr(apigen, 'build'): - raise NotImplementedError("Provided script does not seem " - "to contain build function") + raise NotImplementedError("%s does not contain 'build' " + "function" %(apigen,)) print >>sys.stderr, 'building documentation' capture = py.io.OutErrCapture() try: From hpk at codespeak.net Sun Jan 28 21:25:49 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 21:25:49 +0100 (CET) Subject: [py-svn] r37500 - in py/trunk/py/test: . testing Message-ID: <20070128202549.95B7510071@code0.codespeak.net> Author: hpk Date: Sun Jan 28 21:25:48 2007 New Revision: 37500 Removed: py/trunk/py/test/host.py py/trunk/py/test/testing/test_host.py Log: postponing generalizing of host specifications for 0.9 Deleted: /py/trunk/py/test/host.py ============================================================================== --- /py/trunk/py/test/host.py Sun Jan 28 21:25:48 2007 +++ (empty file) @@ -1,37 +0,0 @@ - -class InvalidHostSpec(ValueError): - pass - -def parsehostspec(spec): - parts = spec.split(":", 2) - if len(parts) < 2: - raise InvalidHostSpec(spec) - type = parts.pop(0) - if type == 'ssh': - sshaddress = parts.pop(0) - basedir = parts and ":".join(parts) or '' - return SpecSSH(sshaddress, basedir) - elif type == 'socket': - host = parts.pop(0) - if not parts: - raise InvalidHostSpec(spec) - remainder = parts.pop(0) - parts = remainder.split(":", 1) - port = int(parts.pop(0)) - basedir = parts and ":".join(parts) or '' - return SpecSocket(host, port, basedir) - else: - raise InvalidHostSpec(spec) - -class SpecSSH(object): - def __init__(self, sshaddress, basedir): - self.sshaddress = sshaddress - self.basedir = basedir - self.host = sshaddress.split('@', 1)[-1] - -class SpecSocket(object): - def __init__(self, host, port, basedir): - self.host = host - self.port = port - self.basedir = basedir - Deleted: /py/trunk/py/test/testing/test_host.py ============================================================================== --- /py/trunk/py/test/testing/test_host.py Sun Jan 28 21:25:48 2007 +++ (empty file) @@ -1,56 +0,0 @@ -""" - -Testing Host setup and rsyncing operations. - -""" - -import py -from py.__.test.host import parsehostspec - -def test_parse_hostspec_ssh(): - hostspec = parsehostspec("ssh:xyz at domain.net:directory") - assert hostspec.host == "domain.net" - assert hostspec.basedir == "directory" - assert hostspec.sshaddress == "xyz at domain.net" - - hostspec = parsehostspec("ssh:xyz at domain.net:direc:tory") - assert hostspec.host == "domain.net" - assert hostspec.basedir == "direc:tory" - assert hostspec.sshaddress == "xyz at domain.net" - - hostspec = parsehostspec("ssh:xyz at domain.net") - assert hostspec.host == "domain.net" - assert hostspec.basedir == "" - assert hostspec.sshaddress == "xyz at domain.net" - - hostspec = parsehostspec("ssh:domain.net:directory") - assert hostspec.host == "domain.net" - assert hostspec.basedir == "directory" - assert hostspec.sshaddress == "domain.net" - - hostspec = parsehostspec("ssh:domain.net:/tmp/hello") - assert hostspec.host == "domain.net" - assert hostspec.basedir == "/tmp/hello" - assert hostspec.sshaddress == "domain.net" - -def test_parse_hostspec_socket(): - hostspec = parsehostspec("socket:domain.net:1234:directory") - assert hostspec.host == "domain.net" - assert hostspec.port == 1234 - assert hostspec.basedir == "directory" - - hostspec = parsehostspec("socket:domain.net:1234") - assert hostspec.host == "domain.net" - assert hostspec.port == 1234 - assert hostspec.basedir == "" - -def test_parse_hostspec_error(): - py.test.raises(ValueError, """ - parsehostspec('alksd:qweqwe') - """) - py.test.raises(ValueError, """ - parsehostspec('ssh') - """) - py.test.raises(ValueError, """ - parsehostspec('socket:qweqwe') - """) From hpk at codespeak.net Sun Jan 28 21:37:31 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 21:37:31 +0100 (CET) Subject: [py-svn] r37501 - in py/trunk/py/test: . testing Message-ID: <20070128203731.4C3B910068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 21:37:30 2007 New Revision: 37501 Modified: py/trunk/py/test/config.py py/trunk/py/test/conftesthandle.py py/trunk/py/test/testing/test_conftesthandle.py Log: rename for clarity Modified: py/trunk/py/test/config.py ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py Sun Jan 28 21:37:30 2007 @@ -122,7 +122,7 @@ """ same as previous, but returns conftest's path as well """ - val, mod = self.conftest.rget_path(name, path) + val, mod = self.conftest.rget_with_confmod(name, path) return val, py.path.local(mod.__file__).dirpath() def initsession(self): Modified: py/trunk/py/test/conftesthandle.py ============================================================================== --- py/trunk/py/test/conftesthandle.py (original) +++ py/trunk/py/test/conftesthandle.py Sun Jan 28 21:37:30 2007 @@ -64,7 +64,7 @@ modules.reverse() return self._get(name, modules) - def rget_path(self, name, path=None): + def rget_with_confmod(self, name, path=None): return self._rget(name, path) def _get(self, name, modules): Modified: py/trunk/py/test/testing/test_conftesthandle.py ============================================================================== --- py/trunk/py/test/testing/test_conftesthandle.py (original) +++ py/trunk/py/test/testing/test_conftesthandle.py Sun Jan 28 21:37:30 2007 @@ -68,7 +68,7 @@ def test_value_access_path(self): topdir = self.basedir.join("adir", "b") conftest = Conftest(topdir) - _, mod = conftest.rget_path("a") + _, mod = conftest.rget_with_confmod("a") assert py.path.local(mod.__file__).dirpath() == topdir class TestConftestValueAccessInPackage(TestConftestValueAccessGlobal): From hpk at codespeak.net Sun Jan 28 22:54:14 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Sun, 28 Jan 2007 22:54:14 +0100 (CET) Subject: [py-svn] r37502 - in py/trunk/py: doc test test/rsession test/rsession/testing Message-ID: <20070128215414.C027310068@code0.codespeak.net> Author: hpk Date: Sun Jan 28 22:54:12 2007 New Revision: 37502 Modified: py/trunk/py/doc/test.txt py/trunk/py/test/config.py py/trunk/py/test/rsession/hostmanage.py py/trunk/py/test/rsession/rsession.py py/trunk/py/test/rsession/testing/test_rsession.py Log: unify dist_* options and give dist_rsync_roots more precision: you now specify relative paths (relative to the conftest.py where a dist_rsync_root setting resides) or absolute paths. Modified: py/trunk/py/doc/test.txt ============================================================================== --- py/trunk/py/doc/test.txt (original) +++ py/trunk/py/doc/test.txt Sun Jan 28 22:54:12 2007 @@ -691,9 +691,8 @@ The options that you need to specify in that conftest.py file are: -* **`dist_hosts`**: a required list of ssh addresses (which each may - include a path, default path is: ``$HOME/pytestcache-HOSTNAME``) -* `dist_rsyncroots` - a list of packages to copy to the remote machines. +* `dist_hosts`: a required list of host specifications +* `dist_rsync_roots` - a list of relative locations to copy to the remote machines. * `dist_remotepython` - the remote python executable to run. * `dist_nicelevel` - process priority of remote nodes. * `dist_boxing` - will run each single test in a separate process @@ -703,7 +702,7 @@ Sample configuration:: dist_hosts = ['localhost', 'user at someserver:/tmp/somedir'] - dist_rsyncroots = ['pypy', 'py'] + dist_rsyncroots = ['../pypy', '../py'] dist_remotepython = 'python2.4' dist_nicelevel = 10 dist_boxing = True Modified: py/trunk/py/test/config.py ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py Sun Jan 28 22:54:12 2007 @@ -118,13 +118,6 @@ except KeyError: return self.conftest.rget(name, path) - def getvalue_and_confpath(self, name, path=None): - """ same as previous, but returns conftest's path - as well - """ - val, mod = self.conftest.rget_with_confmod(name, path) - return val, py.path.local(mod.__file__).dirpath() - def initsession(self): """ return an initialized session object. """ cls = self._getsessionclass() Modified: py/trunk/py/test/rsession/hostmanage.py ============================================================================== --- py/trunk/py/test/rsession/hostmanage.py (original) +++ py/trunk/py/test/rsession/hostmanage.py Sun Jan 28 22:54:12 2007 @@ -51,10 +51,10 @@ dir, base = os.path.split(path) if base == '.svn': return False - if self.rsync_roots is None or dir != self.sourcedir: + if dir != self.sourcedir: return True else: - return base in self.rsync_roots + return self.rsync_roots is None or path in self.rsync_roots class DummyGateway(object): pass Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Sun Jan 28 22:54:12 2007 @@ -133,17 +133,17 @@ super(RSession, self).fixoptions() config = self.config try: - config.getvalue('disthosts') + config.getvalue('dist_hosts') except KeyError: - print "You're trying to run RSession without disthosts specified" - print "you need to specify it in your conftest.py (ie. ~/conftest.py)" + print "For running ad-hoc distributed tests you need to specify" + print "dist_hosts in a local conftest.py file, for example:" print "for example:" - print " disthosts = ['localhost'] * 4 # for 3 processors" - print " - or -" - print " disthosts = ['you at some.remote.com'] # for remote testing" - print " # with your remote ssh account" - print "http://codespeak.net/py/current/doc/test.html#automated-distributed-testing" - print " for more info..." + print + print " dist_hosts = ['localhost'] * 4 # for 3 processors" + print " dist_hosts = ['you at remote.com', '...'] # for testing on ssh accounts" + print " # with your remote ssh accounts" + print + print "see also: http://codespeak.net/py/current/doc/test.html#automated-distributed-testing" raise SystemExit def main(self, reporter=None): @@ -195,11 +195,22 @@ """ Read from conftest file the configuration of distributed testing """ try: - rsync_roots = self.config.getvalue("distrsync_roots") - except: - rsync_roots = None # all files and directories in the pkgdir + conftest = self.config.conftest + value, mod = conftest.rget_with_confmod('dist_rsync_roots') + except KeyError: + rsync_roots = [self.config.topdir] # our best guess likely + else: + assert isinstance(value, (list,tuple)), value + base = py.path.local(mod.__file__).dirpath() + print "base", base + rsync_roots = [base.join(path, abs=True) + for path in value] + for root in rsync_roots: + assert root.check(dir=1) + #rsync_roots = value + print "rsync_roots", rsync_roots sshhosts = [HostInfo(i) for i in - self.config.getvalue("disthosts")] + self.config.getvalue("dist_hosts")] parse_directories(sshhosts) remotepython = self.config.getvalue("dist_remotepython") return sshhosts, remotepython, rsync_roots Modified: py/trunk/py/test/rsession/testing/test_rsession.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_rsession.py (original) +++ py/trunk/py/test/rsession/testing/test_rsession.py Sun Jan 28 22:54:12 2007 @@ -76,7 +76,7 @@ def test_example_distribution_minus_x(self): tmpdir = py.test.ensuretemp("example_distribution_minus_x") tmpdir.ensure("sub", "conftest.py").write(py.code.Source(""" - disthosts = [%r] + dist_hosts = [%r] """ % ('localhost',))) tmpdir.ensure("sub", "__init__.py") tmpdir.ensure("sub", "test_one.py").write(py.code.Source(""" @@ -106,9 +106,9 @@ subdir = "sub_example_dist" tmpdir = py.test.ensuretemp("example_distribution") tmpdir.ensure(subdir, "conftest.py").write(py.code.Source(""" - disthosts = [%r] - distrsync_roots = ["%s", "py"] - """ % ('localhost', subdir))) + dist_hosts = [%r] + dist_rsync_roots = ["%s", "../py"] + """ % ('localhost', tmpdir.join(subdir), ))) tmpdir.ensure(subdir, "__init__.py") tmpdir.ensure(subdir, "test_one.py").write(py.code.Source(""" def test_1(): @@ -161,7 +161,8 @@ teardown_events = [] config = py.test.config._reparse([]) - opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) + opts = HostOptions(optimise_localhost=False, + rsync_roots=[py.path.local(py.__file__).dirpath()]) hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(setup_events.append) hm.teardown_hosts(teardown_events.append, @@ -188,7 +189,8 @@ allevents = [] config = py.test.config._reparse([]) - opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) + opts = HostOptions(optimise_localhost=False, + rsync_roots=[py.path.local(py.__file__).dirpath()]) hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(allevents.append) @@ -235,7 +237,8 @@ from py.__.test.rsession.master import defaultconftestnames defaultconftestnames.append("custom") try: - opts = HostOptions(optimise_localhost=False, rsync_roots=['py']) + opts = HostOptions(optimise_localhost=False, + rsync_roots=[py.path.local(py.__file__).dirpath()]) hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(allevents.append) @@ -267,7 +270,7 @@ tmpdir = py.test.ensuretemp("nice") tmpdir.ensure("__init__.py") tmpdir.ensure("conftest.py").write(py.code.Source(""" - disthosts = ['localhost'] + dist_hosts = ['localhost'] dist_nicelevel = 10 """)) tmpdir.ensure("test_one.py").write("""def test_nice(): From guido at codespeak.net Mon Jan 29 13:53:53 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Mon, 29 Jan 2007 13:53:53 +0100 (CET) Subject: [py-svn] r37531 - py/trunk/py/test/rsession Message-ID: <20070129125353.05D9710063@code0.codespeak.net> Author: guido Date: Mon Jan 29 13:53:52 2007 New Revision: 37531 Modified: py/trunk/py/test/rsession/rsession.py Log: Removing try/except to make debugging a little bit easier. Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Mon Jan 29 13:53:52 2007 @@ -277,19 +277,9 @@ print >>sys.stderr, 'building documentation' capture = py.io.OutErrCapture() try: - try: - pkgdir = self.getpkgdir(self.config.args[0]) - apigen.build(pkgdir, - DocStorageAccessor(self.docstorage)) - except AttributeError: - import traceback - exc, e, tb = sys.exc_info() - print '%s - %s' % (exc, e) - print ''.join(traceback.format_tb(tb)) - del tb - print '-' * 79 - raise NotImplementedError("Provided script does not seem " - "to contain build function") + pkgdir = self.getpkgdir(self.config.args[0]) + apigen.build(pkgdir, + DocStorageAccessor(self.docstorage)) finally: capture.reset() @@ -330,3 +320,4 @@ return box_runner return plain_runner + From fijal at codespeak.net Mon Jan 29 14:06:24 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 29 Jan 2007 14:06:24 +0100 (CET) Subject: [py-svn] r37533 - in py/trunk/py/test: . rsession rsession/testing testing Message-ID: <20070129130624.C887610063@code0.codespeak.net> Author: fijal Date: Mon Jan 29 14:06:19 2007 New Revision: 37533 Added: py/trunk/py/test/rsession/testing/test_rsync.py Modified: py/trunk/py/test/config.py py/trunk/py/test/conftesthandle.py py/trunk/py/test/rsession/hostmanage.py py/trunk/py/test/rsession/rsession.py py/trunk/py/test/rsession/testing/test_rsession.py py/trunk/py/test/rsession/testing/test_slave.py py/trunk/py/test/testing/test_conftesthandle.py Log: Make distribution working with custom conftests at exact levels. This is very explicit - dist_rsyncroots works only in that conftest directory. Modified: py/trunk/py/test/config.py ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py Mon Jan 29 14:06:19 2007 @@ -118,6 +118,14 @@ except KeyError: return self.conftest.rget(name, path) + def getvalue_from_confpath(self, name, path): + """ same as previous, but returns only value from explicit + conftest path + """ + if isinstance(path, str): + path = py.path.local(path) + return self.conftest.rget_path(name, path) + def initsession(self): """ return an initialized session object. """ cls = self._getsessionclass() Modified: py/trunk/py/test/conftesthandle.py ============================================================================== --- py/trunk/py/test/conftesthandle.py (original) +++ py/trunk/py/test/conftesthandle.py Mon Jan 29 14:06:19 2007 @@ -11,6 +11,7 @@ """ def __init__(self, path=None): self._path2confmods = {} + self._path2conftest_files = {} # direct cache of conftest files, to avoid confusion if path is not None: self.setinitial([path]) @@ -41,45 +42,62 @@ except KeyError: dp = path.dirpath() if dp == path: - return [importconfig(defaultconftestpath)] + return [self.importconfig(defaultconftestpath)] clist = self.getconftestmodules(dp) conftestpath = path.join("conftest.py") if conftestpath.check(file=1): - clist.append(importconfig(conftestpath)) + clist.append(self.importconfig(conftestpath)) self._path2confmods[path] = clist # be defensive: avoid changes from caller side to # affect us by always returning a copy of the actual list return clist[:] + def getconftest(self, path): + """ Return a direct module of that path + """ + try: + return self._path2conftest_files[path] + except KeyError: + conftestpath = path.join("conftest.py") + if conftestpath.check(file=1): + return self.importconfig(conftestpath) + raise AttributeError + # we raise here AttributeError to unify error reporting in case + # of lack of variable in conftest or lack of file, but we do not want to + # hide ImportError + # XXX no real use case, may probably go #def lget(self, name, path=None): # modules = self.getconftestmodules(path) # return self._get(name, modules) def rget(self, name, path=None): - return self._rget(name, path)[0] - - def _rget(self, name, path=None): modules = self.getconftestmodules(path) modules.reverse() return self._get(name, modules) - def rget_with_confmod(self, name, path=None): - return self._rget(name, path) + def rget_path(self, name, path): + """ can raise AttributeError + """ + return getattr(self.getconftest(path), name) def _get(self, name, modules): for mod in modules: try: - return getattr(mod, name), mod + return getattr(mod, name) except AttributeError: continue raise KeyError, name -def importconfig(configpath): - if not configpath.dirpath('__init__.py').check(file=1): - # HACK: we don't want any "globally" imported conftest.py, - # prone to conflicts and subtle problems - modname = str(configpath).replace('.', configpath.sep) - return configpath.pyimport(modname=modname) - else: - return configpath.pyimport() + def importconfig(self, configpath): + # We could have used caching here, but it's redundant since + # they're cached on path anyway, so we use it only when doing rget_path + if not configpath.dirpath('__init__.py').check(file=1): + # HACK: we don't want any "globally" imported conftest.py, + # prone to conflicts and subtle problems + modname = str(configpath).replace('.', configpath.sep) + mod = configpath.pyimport(modname=modname) + else: + mod = configpath.pyimport() + self._path2conftest_files[configpath.dirpath()] = mod + return mod Modified: py/trunk/py/test/rsession/hostmanage.py ============================================================================== --- py/trunk/py/test/rsession/hostmanage.py (original) +++ py/trunk/py/test/rsession/hostmanage.py Mon Jan 29 14:06:19 2007 @@ -41,20 +41,24 @@ class HostRSync(py.execnet.RSync): """ An rsync wrapper which filters out *~, .svn/ and *.pyc """ - def __init__(self, rsync_roots): + def __init__(self, config): py.execnet.RSync.__init__(self, delete=True) - self.rsync_roots = rsync_roots + self.config = config def filter(self, path): if path.endswith('.pyc') or path.endswith('~'): return False dir, base = os.path.split(path) + try: + rsync_roots = self.config.getvalue_from_confpath("dist_rsyncroots", + dir) + except AttributeError: + rsync_roots = None if base == '.svn': return False - if dir != self.sourcedir: + if rsync_roots is None: return True - else: - return self.rsync_roots is None or path in self.rsync_roots + return base in rsync_roots class DummyGateway(object): pass @@ -64,10 +68,9 @@ as different function parameters, mostly related to tests only """ - def __init__(self, rsync_roots=None, remote_python="python", + def __init__(self, remote_python="python", optimise_localhost=True, do_sync=True, create_gateways=True): - self.rsync_roots = rsync_roots self.remote_python = remote_python self.optimise_localhost = optimise_localhost self.do_sync = do_sync @@ -145,7 +148,7 @@ rsynced = {} if self.options.do_sync: - rsync = HostRSync(self.options.rsync_roots) + rsync = HostRSync(self.config) for host in hosts: if not self.need_rsync(rsynced, host.hostname, host.relpath): reporter(report.HostReady(host)) Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Mon Jan 29 14:06:19 2007 @@ -150,7 +150,7 @@ """ main loop for running tests. """ args = self.config.args - sshhosts, remotepython, rsync_roots = self.read_distributed_config() + sshhosts, remotepython = self.read_distributed_config() reporter, startserverflag = self.init_reporter(reporter, sshhosts, RemoteReporter) reporter, checkfun = self.wrap_reporter(reporter) @@ -158,8 +158,7 @@ reporter(report.TestStarted(sshhosts)) done_dict = {} - hostopts = HostOptions(rsync_roots=rsync_roots, - remote_python=remotepython, + hostopts = HostOptions(remote_python=remotepython, optimise_localhost=self.optimise_localhost) hostmanager = HostManager(sshhosts, self.config, hostopts) try: @@ -194,26 +193,11 @@ def read_distributed_config(self): """ Read from conftest file the configuration of distributed testing """ - try: - conftest = self.config.conftest - value, mod = conftest.rget_with_confmod('dist_rsync_roots') - except KeyError: - rsync_roots = [self.config.topdir] # our best guess likely - else: - assert isinstance(value, (list,tuple)), value - base = py.path.local(mod.__file__).dirpath() - print "base", base - rsync_roots = [base.join(path, abs=True) - for path in value] - for root in rsync_roots: - assert root.check(dir=1) - #rsync_roots = value - print "rsync_roots", rsync_roots sshhosts = [HostInfo(i) for i in self.config.getvalue("dist_hosts")] parse_directories(sshhosts) remotepython = self.config.getvalue("dist_remotepython") - return sshhosts, remotepython, rsync_roots + return sshhosts, remotepython def dispatch_tests(self, nodes, reporter, checkfun, done_dict): colitems = self.config.getcolitems() Modified: py/trunk/py/test/rsession/testing/test_rsession.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_rsession.py (original) +++ py/trunk/py/test/rsession/testing/test_rsession.py Mon Jan 29 14:06:19 2007 @@ -161,8 +161,7 @@ teardown_events = [] config = py.test.config._reparse([]) - opts = HostOptions(optimise_localhost=False, - rsync_roots=[py.path.local(py.__file__).dirpath()]) + opts = HostOptions(optimise_localhost=False) hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(setup_events.append) hm.teardown_hosts(teardown_events.append, @@ -189,8 +188,7 @@ allevents = [] config = py.test.config._reparse([]) - opts = HostOptions(optimise_localhost=False, - rsync_roots=[py.path.local(py.__file__).dirpath()]) + opts = HostOptions(optimise_localhost=False) hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(allevents.append) @@ -237,8 +235,7 @@ from py.__.test.rsession.master import defaultconftestnames defaultconftestnames.append("custom") try: - opts = HostOptions(optimise_localhost=False, - rsync_roots=[py.path.local(py.__file__).dirpath()]) + opts = HostOptions(optimise_localhost=False) hm = HostManager(hosts, config, opts) nodes = hm.init_hosts(allevents.append) Added: py/trunk/py/test/rsession/testing/test_rsync.py ============================================================================== --- (empty file) +++ py/trunk/py/test/rsession/testing/test_rsync.py Mon Jan 29 14:06:19 2007 @@ -0,0 +1,30 @@ + +""" RSync filter test +""" + +import py +from py.__.test.rsession.hostmanage import HostRSync + +def test_rsync(): + tmpdir = py.test.ensuretemp("rsync_rsession") + tmpdir.ensure("a", dir=True) + tmpdir.ensure("b", dir=True) + tmpdir.ensure("conftest.py").write(py.code.Source(""" + dist_rsyncroots = ['a'] + """)) + tmpdir.join("a").ensure("x") + adir = tmpdir.join("a").ensure("xy", dir=True) + adir.ensure("conftest.py").write(py.code.Source(""" + dist_rsyncroots = ['b', 'conftest.py'] + """)) + adir.ensure("a", dir=True) + adir.ensure("b", dir=True) + config = py.test.config._reparse([str(tmpdir)]) + h = HostRSync(config) + h.sourcedir = config.topdir + assert h.filter(str(tmpdir.join("a"))) + assert not h.filter(str(tmpdir.join("b"))) + assert h.filter(str(tmpdir.join("a").join("x"))) + assert h.filter(str(adir.join("conftest.py"))) + assert not h.filter(str(adir.join("a"))) + assert h.filter(str(adir.join("b"))) Modified: py/trunk/py/test/rsession/testing/test_slave.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_slave.py (original) +++ py/trunk/py/test/rsession/testing/test_slave.py Mon Jan 29 14:06:19 2007 @@ -179,4 +179,3 @@ os._exit(0) # check if this really exits py.test.raises(OSError, "os.waitpid(pid, 0)") - Modified: py/trunk/py/test/testing/test_conftesthandle.py ============================================================================== --- py/trunk/py/test/testing/test_conftesthandle.py (original) +++ py/trunk/py/test/testing/test_conftesthandle.py Mon Jan 29 14:06:19 2007 @@ -67,9 +67,12 @@ def test_value_access_path(self): topdir = self.basedir.join("adir", "b") + topdir.ensure("xx", dir=True) conftest = Conftest(topdir) - _, mod = conftest.rget_with_confmod("a") - assert py.path.local(mod.__file__).dirpath() == topdir + assert conftest.rget_path("a", topdir) == 1.5 + assert conftest.rget_path("a", topdir.dirpath()) == 1 + py.test.raises(AttributeError, "conftest.rget_path('a', topdir.join('xx'))") + #assert py.path.local(mod.__file__).dirpath() == topdir class TestConftestValueAccessInPackage(TestConftestValueAccessGlobal): def setup_class(cls): From guido at codespeak.net Mon Jan 29 14:09:35 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Mon, 29 Jan 2007 14:09:35 +0100 (CET) Subject: [py-svn] r37534 - py/trunk/py/apigen Message-ID: <20070129130935.E1C9510063@code0.codespeak.net> Author: guido Date: Mon Jan 29 14:09:33 2007 New Revision: 37534 Modified: py/trunk/py/apigen/htmlgen.py Log: Some minor visual modifications for stack traces, fixed check for py.code.Source object filenames. Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Mon Jan 29 14:09:33 2007 @@ -636,15 +636,17 @@ return py.path.local(sourcefile).relto(self.projpath) def build_callsite(self, functionname, call_site): - tbtag = self.gen_traceback(functionname, call_site) + tbtag = self.gen_traceback(functionname, reversed(call_site)) tag = H.CallStackItem( - H.a("%s - line %s" % (call_site[0].filename, call_site[0].lineno + 1), + H.a("show/hide stack trace %s - line %s" % ( + call_site[0].filename, call_site[0].lineno + 1), href='#', onclick="showhideel(getnextsibling(this)); return false;"), H.div(tbtag, style='display: none') ) return tag + _reg_source = py.std.re.compile(r'([^>]*)<(.*)>') def gen_traceback(self, funcname, call_site): tbdiv = H.div() for line in call_site: @@ -662,8 +664,8 @@ linktext = '%s - line %s' % (sourcefile, line.lineno + 1) # skip py.code.Source objects and source files outside of the # package - if (not sourcefile.startswith('None') and - self.is_in_pkg(sourcefile)): + is_code_source = self._reg_source.match(sourcefile) + if (not is_code_source and self.is_in_pkg(sourcefile)): href = self.linker.get_lazyhref(sourcefile) sourcelink = H.a(linktext, href=href) else: From fijal at codespeak.net Mon Jan 29 14:10:53 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 29 Jan 2007 14:10:53 +0100 (CET) Subject: [py-svn] r37535 - py/trunk/py/doc Message-ID: <20070129131053.D181310063@code0.codespeak.net> Author: fijal Date: Mon Jan 29 14:10:51 2007 New Revision: 37535 Modified: py/trunk/py/doc/TODO.txt Log: update on that Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Mon Jan 29 14:10:51 2007 @@ -119,7 +119,8 @@ * (DONE, except apigen) cleanup initialisation of config / get rid of pkgdir * unify option names (dist_*) * (optional) see if more of py/test/session.py's Session can be reused -* have dist_rsyncroots be relative to the conftest.py file +* (DONE, but slightly different way) + have dist_rsyncroots be relative to the conftest.py file so that projects can define it for themselves, e.g. pypy/conftest.py would contain:: @@ -132,6 +133,15 @@ method with tests and documentation, and with providing the right example. + way it's done: + + dist_rsyncroots refer *only* to a directory where it's placed. + This avoids tons of confusion, like what to do if different conftests + point to the same place. So by now pypy rootdir should contain + conftest.py with:: + + dist_rsyncroots = ['pypy', 'pylib', 'lib-python'] + code quality ----------------- From guido at codespeak.net Mon Jan 29 15:20:33 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Mon, 29 Jan 2007 15:20:33 +0100 (CET) Subject: [py-svn] r37540 - in py/trunk/py/apigen: . testing tracer Message-ID: <20070129142033.CE9F410071@code0.codespeak.net> Author: guido Date: Mon Jan 29 15:20:31 2007 New Revision: 37540 Modified: py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/testing/test_apigen_functional.py py/trunk/py/apigen/testing/test_htmlgen.py py/trunk/py/apigen/tracer/description.py Log: Nicer formatting of docstrings (de-indented and such), fixed problem getting to frame source (IOError that popped up when building the py lib's api docs) in description.py. Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Mon Jan 29 15:20:31 2007 @@ -12,6 +12,41 @@ html = py.xml.html raw = py.xml.raw +def deindent(str, linesep=os.linesep): + """ de-indent string + + can be used to de-indent Python docstrings, it de-indents the first + line to the side always, and determines the indentation of the rest + of the text by taking that of the least indented (filled) line + """ + lines = str.split(linesep) + normalized = [] + deindent = None + normalized.append(lines[0].strip()) + for line in lines[1:]: + if not line.strip(): + normalized.append('') + else: + line = line.rstrip() + line = line.replace('\t', ' ') + indent = 0 + for c in line: + if c != ' ': + break + indent += 1 + if deindent is None or indent < deindent: + deindent = indent + normalized.append(line) + while normalized[-1] == '': + normalized.pop() + ret = [normalized[0]] + for line in normalized[1:]: + if not line: + ret.append(line) + else: + ret.append(line[deindent:]) + return '%s\n' % (linesep.join(ret),) + # HTML related stuff class H(html): class Content(html.div): @@ -50,8 +85,9 @@ class ParameterDescription(html.div): pass - class Docstring(html.div): - style = html.Style(white_space='pre', min_height='3em') + class Docstring(html.pre): + #style = html.Style(white_space='pre', min_height='3em') + pass class Navigation(html.div): style = html.Style(min_height='99%', float='left', margin_top='1.2em', @@ -309,7 +345,9 @@ """ build the html for a class method """ # XXX we may want to have seperate func = self.dsa.get_obj(dotted_name) - docstring = func.__doc__ + docstring = func.__doc__ + if docstring: + docstring = deindent(docstring) localname = func.__name__ argdesc = get_param_htmldesc(self.linker, func) valuedesc = self.build_callable_signature_description(dotted_name) @@ -343,7 +381,7 @@ ) snippet = H.FunctionDescription( H.FunctionDef(localname, argdesc), - H.Docstring(docstring or H.em('no docstring available')), + H.Docstring(docstring or '*no docstring available*'), H.div(H.a('show/hide info', href='#', onclick=('showhideel(getnextsibling(this));' @@ -372,6 +410,8 @@ href=self.linker.get_lazyhref(sourcefile))) docstring = cls.__doc__ + if docstring: + docstring = deindent(docstring) methods = self.dsa.get_class_methods(dotted_name) basehtml = [] bases = self.dsa.get_possible_base_classes(dotted_name) @@ -394,7 +434,7 @@ snippet = H.ClassDescription( # XXX bases HTML H.ClassDef('%s(' % (clsname,), *basehtml), - H.Docstring(docstring or H.em('no docstring available')), + H.Docstring(docstring or '*no docstring available*'), sourcelink, ) if methods: @@ -413,9 +453,11 @@ docstring = None else: docstring = obj.__doc__ + if docstring: + docstring = deindent(docstring) snippet = H.NamespaceDescription( H.NamespaceDef(namespace_dotted_name), - H.Docstring(docstring or H.em('no docstring available')) + H.Docstring(docstring or '*no docstring available*') ) for dotted_name in sorted(item_dotted_names): itemname = dotted_name.split('.')[-1] Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Mon Jan 29 15:20:31 2007 @@ -69,6 +69,13 @@ assert pak.main.sub.func(20) is None s = pak.main.func(pak.main.SomeTestClass, 10) assert isinstance(s, pak.main.SomeTestClass) + + # some nice things to confuse the tracer/storage + source = py.code.Source('''\ + pak.main.sub.func(10) + ''') + c = compile(str(source), '', 'exec') + exec c in globals() """)) return temp, 'pak' Modified: py/trunk/py/apigen/testing/test_htmlgen.py ============================================================================== --- py/trunk/py/apigen/testing/test_htmlgen.py (original) +++ py/trunk/py/apigen/testing/test_htmlgen.py Mon Jan 29 15:20:31 2007 @@ -43,3 +43,12 @@ assert dirnames == ['sub'] assert filenames == ['file1.py', 'file3.c'] +def test_deindent(): + assert htmlgen.deindent('foo\n\n bar\n ') == 'foo\n\nbar\n' + assert htmlgen.deindent(' foo\n\n bar\n ') == 'foo\n\nbar\n' + assert htmlgen.deindent('foo\n\n bar\n baz') == 'foo\n\nbar\nbaz\n' + assert htmlgen.deindent(' foo\n\n bar\n baz\n') == ( + 'foo\n\nbar\n baz\n') + assert htmlgen.deindent('foo\n\n bar\n baz\n') == ( + 'foo\n\n bar\nbaz\n') + Modified: py/trunk/py/apigen/tracer/description.py ============================================================================== --- py/trunk/py/apigen/tracer/description.py (original) +++ py/trunk/py/apigen/tracer/description.py Mon Jan 29 15:20:31 2007 @@ -19,7 +19,10 @@ self.filename = frame.code.raw.co_filename self.lineno = frame.lineno self.firstlineno = frame.code.firstlineno - self.source = getsource(frame.code.raw) + try: + self.source = getsource(frame.code.raw) + except IOError: + self.source = "could not get to source" def _getval(self): return (self.filename, self.lineno) From guido at codespeak.net Mon Jan 29 17:11:23 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Mon, 29 Jan 2007 17:11:23 +0100 (CET) Subject: [py-svn] r37545 - in py/trunk/py/apigen: . testing tracer tracer/testing Message-ID: <20070129161123.A454A10064@code0.codespeak.net> Author: guido Date: Mon Jan 29 17:11:15 2007 New Revision: 37545 Modified: py/trunk/py/apigen/apigen.py py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/style.css py/trunk/py/apigen/testing/test_apigen_functional.py py/trunk/py/apigen/tracer/docstorage.py py/trunk/py/apigen/tracer/testing/test_docgen.py Log: Moved get_star_import_tree out of the DocStorage class, created 'pkg_to_dict' function in docstorage.py and using that from apigen.py (to later simplify py.test integration, and to improve testability). Simplified 'deindent()' a bit, made the wrap_page use the filenames from the stylesheeturl and the scripturls instead of having them hard-coded, some minor HTML/CSS changes. Modified: py/trunk/py/apigen/apigen.py ============================================================================== --- py/trunk/py/apigen/apigen.py (original) +++ py/trunk/py/apigen/apigen.py Mon Jan 29 17:11:15 2007 @@ -10,11 +10,12 @@ from py.__.apigen import htmlgen from py.__.apigen import linker from py.__.apigen import project +from py.__.apigen.tracer.docstorage import pkg_to_dict def get_documentable_items(pkgdir): sys.path.insert(0, str(pkgdir.dirpath())) rootmod = __import__(pkgdir.basename) - return rootmod + return pkg_to_dict(rootmod) def build(pkgdir, dsa): l = linker.Linker() Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Mon Jan 29 17:11:15 2007 @@ -19,26 +19,23 @@ line to the side always, and determines the indentation of the rest of the text by taking that of the least indented (filled) line """ - lines = str.split(linesep) + lines = str.strip().split(linesep) normalized = [] deindent = None normalized.append(lines[0].strip()) + # replace tabs with spaces, empty lines that contain spaces only, and + # find out what the smallest indentation is for line in lines[1:]: - if not line.strip(): + line = line.replace('\t', ' ') + stripped = line.strip() + if not stripped: normalized.append('') else: - line = line.rstrip() - line = line.replace('\t', ' ') - indent = 0 - for c in line: - if c != ' ': - break - indent += 1 + rstripped = line.rstrip() + indent = len(rstripped) - len(stripped) if deindent is None or indent < deindent: deindent = indent normalized.append(line) - while normalized[-1] == '': - normalized.pop() ret = [normalized[0]] for line in normalized[1:]: if not line: @@ -182,10 +179,12 @@ stylesheeturl=stylesheeturl, scripturls=scripturls) page.set_content(contentel) here = py.magic.autopath().dirpath() - style = here.join('style.css').read() - outputpath.join('style.css').write(style) - apijs = here.join('api.js').read() - outputpath.join('api.js').write(apijs) + style = here.join(stylesheeturl.split('/')[-1]).read() + outputpath.join(stylesheeturl.split('/')[-1]).write(style) + for spath in scripturls: + sname = spath.split('/')[-1] + sdata = here.join(sname).read() + outputpath.join(sname).write(sdata) return page # the PageBuilder classes take care of producing the docs (using the stuff @@ -281,6 +280,7 @@ try: tag = H.NonPythonSource(unicode(fspath.read(), 'utf-8')) except UnicodeError: + # XXX we should fix non-ascii support here!! tag = H.NonPythonSource('no source available (binary file?)') nav = self.build_navigation(fspath) return tag, nav @@ -380,7 +380,7 @@ csdiv, ) snippet = H.FunctionDescription( - H.FunctionDef(localname, argdesc), + H.FunctionDef('def %s' % (localname,), argdesc), H.Docstring(docstring or '*no docstring available*'), H.div(H.a('show/hide info', href='#', @@ -684,7 +684,7 @@ call_site[0].filename, call_site[0].lineno + 1), href='#', onclick="showhideel(getnextsibling(this)); return false;"), - H.div(tbtag, style='display: none') + H.div(tbtag, style='display: none', class_='callstackitem'), ) return tag Modified: py/trunk/py/apigen/style.css ============================================================================== --- py/trunk/py/apigen/style.css (original) +++ py/trunk/py/apigen/style.css Mon Jan 29 17:11:15 2007 @@ -42,12 +42,15 @@ font-weight: bold; } -body, div, p, h1, h2, h3, h4 { - font-family: Trebuchet MS, Verdana, Arial; +body { background-color: #FFE; color: black; } +body, div, p, h1, h2, h3, h4 { + font-family: Trebuchet MS, Verdana, Arial; +} + a { color: #006; text-decoration: none; @@ -107,5 +110,11 @@ border: 1px solid black; color: black; padding: 1em; + background-color: white; +} + +.callstackitem { + border: 1px solid black; + margin-bottom: 1em; } Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Mon Jan 29 17:11:15 2007 @@ -47,6 +47,7 @@ 'main.SomeTestClass': ('./sometestclass.py', 'SomeTestClass'), 'main.SomeTestSubClass': ('./sometestsubclass.py', 'SomeTestSubClass'), + 'somenamespace': ('./somenamespace.py', '*'), }) """)) temp.ensure('pak/test/test_pak.py').write(py.code.Source("""\ @@ -82,9 +83,9 @@ def test_get_documentable_items(): fs_root, package_name = setup_fs_project('test_get_documentable_items') documentable = apigen.get_documentable_items(fs_root.join(package_name)) - assert sorted(documentable.__package__.exportdefs.keys()) == [ + assert sorted(documentable.keys()) == [ 'main.SomeTestClass', 'main.SomeTestSubClass', 'main.func', - 'main.sub.func'] + 'main.sub.func', 'somenamespace.baz', 'somenamespace.foo'] def test_apigen_functional(): fs_root, package_name = setup_fs_project('test_apigen_functional') Modified: py/trunk/py/apigen/tracer/docstorage.py ============================================================================== --- py/trunk/py/apigen/tracer/docstorage.py (original) +++ py/trunk/py/apigen/tracer/docstorage.py Mon Jan 29 17:11:15 2007 @@ -15,6 +15,44 @@ sorted = py.builtin.sorted +def pkg_to_dict(module): + defs = module.__package__.exportdefs + d = {} + for key, value in defs.iteritems(): + chain = key.split('.') + base = module + for elem in chain: + base = getattr(base, elem) + if value[1] == '*': + d.update(get_star_import_tree(base, key)) + else: + d[key] = base + return d + +def get_star_import_tree(module, modname): + """ deal with '*' entries in an initpkg situation """ + ret = {} + modpath = py.path.local(inspect.getsourcefile(module)) + pkgpath = module.__package__.getpath() + for objname in dir(module): + if objname.startswith('_'): + continue # also skip __*__ attributes + obj = getattr(module, objname) + if (isinstance(obj, types.ClassType) or + isinstance(obj, types.ObjectType)): + try: + sourcefile_object = py.path.local( + inspect.getsourcefile(obj)) + except TypeError: + continue + else: + if sourcefile_object.strpath != modpath.strpath: + # not in this package + continue + dotted_name = '%s.%s' % (modname, objname) + ret[dotted_name] = obj + return ret + class DocStorage(object): """ Class storing info about API """ @@ -117,45 +155,10 @@ def from_pkg(self, module, keep_frames=False): self.module = module - defs = module.__package__.exportdefs - d = {} - for key, value in defs.iteritems(): - chain = key.split('.') - base = module - for elem in chain: - base = getattr(base, elem) - if value[1] == '*': - d.update(self.get_star_import_tree(base, key)) - else: - d[key] = base - self.from_dict(d, keep_frames) + self.from_dict(pkg_to_dict(module), keep_frames) # XXX return self - def get_star_import_tree(self, module, modname): - """ deal with '*' entries in an initpkg situation """ - ret = {} - modpath = py.path.local(inspect.getsourcefile(module)) - pkgpath = module.__package__.getpath() - for objname in dir(module): - if objname.startswith('_'): - continue # also skip __*__ attributes - obj = getattr(module, objname) - if (isinstance(obj, types.ClassType) or - isinstance(obj, types.ObjectType)): - try: - sourcefile_object = py.path.local( - inspect.getsourcefile(obj)) - except TypeError: - continue - else: - if sourcefile_object.strpath != modpath.strpath: - # not in this package - continue - dotted_name = '%s.%s' % (modname, objname) - ret[dotted_name] = obj - return ret - def from_module(self, func): raise NotImplementedError("From module") Modified: py/trunk/py/apigen/tracer/testing/test_docgen.py ============================================================================== --- py/trunk/py/apigen/tracer/testing/test_docgen.py (original) +++ py/trunk/py/apigen/tracer/testing/test_docgen.py Mon Jan 29 17:11:15 2007 @@ -6,8 +6,9 @@ import sys #try: -from py.__.apigen.tracer.tracer import DocStorage, Tracer -from py.__.apigen.tracer.docstorage import DocStorageAccessor +from py.__.apigen.tracer.tracer import Tracer +from py.__.apigen.tracer.docstorage import DocStorageAccessor, DocStorage, \ + get_star_import_tree, pkg_to_dict from py.__.apigen.tracer.testing.runtest import cut_pyc from py.__.apigen.tracer.description import FunctionDesc from py.__.apigen.tracer import model @@ -426,7 +427,7 @@ def test_get_initpkg_star_items(): pkg, ds = setup_pkg_docstorage() - sit = ds.get_star_import_tree(pkg.other, 'pkg.other') + sit = get_star_import_tree(pkg.other, 'pkg.other') assert sorted(sit.keys()) == ['pkg.other.baz', 'pkg.other.foo'] t = Tracer(ds) t.start_tracing() @@ -446,3 +447,11 @@ assert isinstance(cell, model.SomeInstance) assert cell.classdef.cls is desc.pyobj +def test_pkg_to_dict(): + pkg, ds = setup_pkg_docstorage() + assert sorted(pkg_to_dict(pkg).keys()) == ['main.SomeClass', + 'main.SomeSubClass', + 'main.sub.func', + 'other.baz', + 'other.foo'] + From fijal at codespeak.net Mon Jan 29 18:11:15 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 29 Jan 2007 18:11:15 +0100 (CET) Subject: [py-svn] r37553 - py/trunk/py/path/local/testing Message-ID: <20070129171115.E8DF110074@code0.codespeak.net> Author: fijal Date: Mon Jan 29 18:11:13 2007 New Revision: 37553 Modified: py/trunk/py/path/local/testing/test_local.py Log: Skip if boxed Modified: py/trunk/py/path/local/testing/test_local.py ============================================================================== --- py/trunk/py/path/local/testing/test_local.py (original) +++ py/trunk/py/path/local/testing/test_local.py Mon Jan 29 18:11:13 2007 @@ -261,6 +261,8 @@ assert not numdir.new(ext=str(i-3)).check() def test_locked_make_numbered_dir(self): + if py.test.config.is_boxed(): + py.test.skip("Fails under boxing") root = self.tmpdir for i in range(10): numdir = local.make_numbered_dir(prefix='base.', rootdir=root, From fijal at codespeak.net Mon Jan 29 18:12:22 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 29 Jan 2007 18:12:22 +0100 (CET) Subject: [py-svn] r37554 - py/trunk/py/execnet Message-ID: <20070129171222.4035D10075@code0.codespeak.net> Author: fijal Date: Mon Jan 29 18:12:17 2007 New Revision: 37554 Modified: py/trunk/py/execnet/rsync.py Log: add XXX Modified: py/trunk/py/execnet/rsync.py ============================================================================== --- py/trunk/py/execnet/rsync.py (original) +++ py/trunk/py/execnet/rsync.py Mon Jan 29 18:12:17 2007 @@ -139,6 +139,7 @@ basename = path[len(self.sourcedir) + 1:] if not linkpoint.startswith(os.sep): # relative link, just send it + # XXX: do sth with ../ links self._send_link(basename, linkpoint) elif linkpoint.startswith(self.sourcedir): self._send_link(basename, linkpoint[len(self.sourcedir) + 1:]) From fijal at codespeak.net Mon Jan 29 18:14:30 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 29 Jan 2007 18:14:30 +0100 (CET) Subject: [py-svn] r37555 - py/trunk/py/doc Message-ID: <20070129171430.C004710075@code0.codespeak.net> Author: fijal Date: Mon Jan 29 18:14:27 2007 New Revision: 37555 Modified: py/trunk/py/doc/TODO.txt Log: update Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Mon Jan 29 18:14:27 2007 @@ -102,14 +102,15 @@ use that check if all py and PyPy tests pass as good as they do without. -* make --box run on the trunk. This requires having some sort of +* (DONE, except py.path.svn) make --box run on the trunk. + This requires having some sort of is_boxed() function, while having it on config object seems to be not that smart idea. * (DONE more or less) try to be as 2.2 compatible as possible (use e.g. py.builtin.enumerate instead of "enumerate" directly) -* (DONE for rsession) have all sessions check their options via +* (DONE) have all sessions check their options via Session.fixoptions() and have session-particular tests and checks accordingly. From guido at codespeak.net Tue Jan 30 11:34:11 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 11:34:11 +0100 (CET) Subject: [py-svn] r37579 - in py/trunk/py: apigen apigen/testing apigen/tracer test/rsession Message-ID: <20070130103411.2A82C10063@code0.codespeak.net> Author: guido Date: Tue Jan 30 11:34:08 2007 New Revision: 37579 Modified: py/trunk/py/apigen/apigen.py py/trunk/py/apigen/testing/test_apigen_functional.py py/trunk/py/apigen/tracer/docstorage.py py/trunk/py/test/rsession/rsession.py Log: Made that the package name can be set when using from_dict() to fill a DocStorage. Modified: py/trunk/py/apigen/apigen.py ============================================================================== --- py/trunk/py/apigen/apigen.py (original) +++ py/trunk/py/apigen/apigen.py Tue Jan 30 11:34:08 2007 @@ -15,7 +15,7 @@ def get_documentable_items(pkgdir): sys.path.insert(0, str(pkgdir.dirpath())) rootmod = __import__(pkgdir.basename) - return pkg_to_dict(rootmod) + return 'py', pkg_to_dict(rootmod) def build(pkgdir, dsa): l = linker.Linker() Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Tue Jan 30 11:34:08 2007 @@ -82,7 +82,9 @@ def test_get_documentable_items(): fs_root, package_name = setup_fs_project('test_get_documentable_items') - documentable = apigen.get_documentable_items(fs_root.join(package_name)) + pkgname, documentable = apigen.get_documentable_items( + fs_root.join(package_name)) + assert pkgname == 'py' assert sorted(documentable.keys()) == [ 'main.SomeTestClass', 'main.SomeTestSubClass', 'main.func', 'main.sub.func', 'somenamespace.baz', 'somenamespace.foo'] Modified: py/trunk/py/apigen/tracer/docstorage.py ============================================================================== --- py/trunk/py/apigen/tracer/docstorage.py (original) +++ py/trunk/py/apigen/tracer/docstorage.py Tue Jan 30 11:34:08 2007 @@ -56,6 +56,9 @@ class DocStorage(object): """ Class storing info about API """ + def __init__(self): + self.module_name = None + def consider_call(self, frame, caller_frame, upward_cut_frame=None): assert isinstance(frame, py.code.Frame) desc = self.find_desc(frame.code, frame.raw.f_locals) @@ -102,7 +105,8 @@ for key, desc in self.descs.iteritems(): self.desc_cache[desc] = desc - def from_dict(self, _dict, keep_frames = False): + def from_dict(self, _dict, keep_frames=False, module_name=None): + self.module_name = module_name self.descs = {} for key, val in _dict.iteritems(): to_key, to_val = self.make_desc(key, val) @@ -155,7 +159,7 @@ def from_pkg(self, module, keep_frames=False): self.module = module - self.from_dict(pkg_to_dict(module), keep_frames) + self.from_dict(pkg_to_dict(module), keep_frames, module.__name__) # XXX return self @@ -260,7 +264,9 @@ return sorted([i.__name__ for i in self.ds.descs[name].exceptions.keys()]) def get_module_name(self): - if hasattr(self.ds, 'module'): + if self.ds.module_name is not None: + return self.ds.module_name + elif hasattr(self.ds, 'module'): return self.ds.module.__name__ return "Unknown module" Modified: py/trunk/py/test/rsession/rsession.py ============================================================================== --- py/trunk/py/test/rsession/rsession.py (original) +++ py/trunk/py/test/rsession/rsession.py Tue Jan 30 11:34:08 2007 @@ -270,32 +270,14 @@ def init_runner(self): if self.config.option.apigen: from py.__.apigen.tracer.tracer import Tracer, DocStorage - module = py - try: - pkgdir = self.getpkgdir(self.config.args[0]) - apigen = py.path.local(self.config.option.apigen).pyimport() - items = apigen.get_documentable_items(pkgdir) - if isinstance(items, dict): - self.docstorage = DocStorage().from_dict(items) - else: - self.docstorage = DocStorage().from_pkg(items) - except ImportError: - import traceback - exc, e, tb = sys.exc_info() - print '%s - %s' % (exc, e) - print ''.join(traceback.format_tb(tb)) - del tb - print '-' * 79 - raise ImportError("Provided script cannot be imported") - except (ValueError, AttributeError): - import traceback - exc, e, tb = sys.exc_info() - print '%s - %s' % (exc, e) - print ''.join(traceback.format_tb(tb)) - del tb - print '-' * 79 + pkgdir = self.getpkgdir(self.config.args[0]) + apigen = py.path.local(self.config.option.apigen).pyimport() + if not hasattr(apigen, 'get_documentable_items'): raise NotImplementedError("Provided script does not seem " "to contain get_documentable_items") + pkgname, items = apigen.get_documentable_items(pkgdir) + self.docstorage = DocStorage().from_dict(items, + module_name=pkgname) self.tracer = Tracer(self.docstorage) return apigen_runner else: From guido at codespeak.net Tue Jan 30 11:45:48 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 11:45:48 +0100 (CET) Subject: [py-svn] r37582 - py/trunk/py/test/rsession/testing Message-ID: <20070130104548.DA7A310071@code0.codespeak.net> Author: guido Date: Tue Jan 30 11:45:46 2007 New Revision: 37582 Modified: py/trunk/py/test/rsession/testing/test_lsession.py Log: Updated mock-up function return value. Modified: py/trunk/py/test/rsession/testing/test_lsession.py ============================================================================== --- py/trunk/py/test/rsession/testing/test_lsession.py (original) +++ py/trunk/py/test/rsession/testing/test_lsession.py Tue Jan 30 11:45:46 2007 @@ -271,7 +271,7 @@ tmpdir = py.test.ensuretemp("lsession_runner_selection") tmpdir.ensure("apigen.py").write(py.code.Source(""" def get_documentable_items(*args): - return {} + return 'foo', {} """)) opt_mapping = { '': plain_runner, From guido at codespeak.net Tue Jan 30 14:24:32 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 14:24:32 +0100 (CET) Subject: [py-svn] r37594 - in py/trunk/py/apigen: . source source/testing testing Message-ID: <20070130132432.CE33710083@code0.codespeak.net> Author: guido Date: Tue Jan 30 14:24:27 2007 New Revision: 37594 Modified: py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/source/html.py py/trunk/py/apigen/source/testing/test_html.py py/trunk/py/apigen/testing/test_apigen_functional.py py/trunk/py/apigen/todo-apigen.txt Log: Fixed unicode issues in apigen/htmlgen.py and apigen/source, moved some methods out of HTMLDocument and added support for finding out the encoding of a Python file in order to accomplish that (both in source/html.py), fixed some minor issues (items with a name starting with _ are now hidden from nav, fixed indentation issue in nav) in htmlgen.py. Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Tue Jan 30 14:24:27 2007 @@ -361,12 +361,12 @@ H.a('source: %s' % (sourcefile,), href=self.linker.get_lazyhref(sourcefile)), H.br(), - H.SourceDef(H.pre(callable_source))) + H.SourceDef(H.pre(unicode(callable_source, 'UTF-8')))) elif not is_in_pkg and sourcefile and callable_source: csource = H.div(H.br(), H.em('source: %s' % (sourcefile,)), H.br(), - H.SourceDef(H.pre(callable_source))) + H.SourceDef(H.pre(unicode(callable_source, 'UTF-8')))) else: csource = H.SourceDef('could not get source file') @@ -460,6 +460,8 @@ H.Docstring(docstring or '*no docstring available*') ) for dotted_name in sorted(item_dotted_names): + if dotted_name.startswith('_'): + continue itemname = dotted_name.split('.')[-1] if is_private(itemname): continue @@ -586,7 +588,7 @@ elif lastlevel and build_children: # XXX hack navitems += build_nav_level('%s.' % (dotted_name,), - depth+2) + depth+1) return navitems @@ -698,9 +700,9 @@ mangled = [] for i, sline in enumerate(str(source).split('\n')): if i == lineno: - l = '-> %s' % (sline,) + l = '-> %s' % (unicode(sline, 'UTF-8'),) else: - l = ' %s' % (sline,) + l = ' %s' % (unicode(sline, 'UTF-8'),) mangled.append(l) if sourcefile: linktext = '%s - line %s' % (sourcefile, line.lineno + 1) Modified: py/trunk/py/apigen/source/html.py ============================================================================== --- py/trunk/py/apigen/source/html.py (original) +++ py/trunk/py/apigen/source/html.py Tue Jan 30 14:24:27 2007 @@ -2,14 +2,13 @@ """ html - generating ad-hoc html out of source browser """ +import py from py.xml import html, raw from compiler import ast import time from py.__.apigen.source.color import Tokenizer, PythonSchema class HtmlEnchanter(object): - reserved_words = ['if', 'for', 'return', 'yield'] - def __init__(self, mod): self.mod = mod self.create_caches() @@ -37,8 +36,30 @@ except KeyError: return [row] # no more info +def prepare_line(text, tokenizer, encoding): + """ adds html formatting to text items (list) + + only processes items if they're of a string type (or unicode) + """ + ret = [] + for item in text: + if type(item) in [str, unicode]: + tokens = tokenizer.tokenize(item) + for t in tokens: + data = unicode(t.data, encoding) + if t.type in ['keyword', 'alt_keyword', 'number', + 'string', 'comment']: + ret.append(html.span(data, class_=t.type)) + else: + ret.append(data) + else: + ret.append(item) + return ret + class HTMLDocument(object): - def __init__(self, tokenizer=None): + def __init__(self, encoding, tokenizer=None): + self.encoding = encoding + self.html = root = html.html() self.head = head = self.create_head() root.append(head) @@ -119,30 +140,11 @@ table.append(tbody) return table, tbody - def prepare_line(self, text): - """ adds html formatting to text items (list) - - only processes items if they're of a string type (or unicode) - """ - ret = [] - for item in text: - if type(item) in [str, unicode]: - tokens = self.tokenizer.tokenize(item) - for t in tokens: - if t.type in ['keyword', 'alt_keyword', 'number', - 'string', 'comment']: - ret.append(html.span(t.data, class_=t.type)) - else: - ret.append(t.data) - else: - ret.append(item) - return ret - def add_row(self, lineno, text): if text == ['']: text = [raw(' ')] else: - text = self.prepare_line(text) + text = prepare_line(text, self.tokenizer, self.encoding) self.tbody.append(html.tr(html.td(str(lineno), class_='lineno'), html.td(class_='code', *text))) @@ -157,7 +159,8 @@ lines = mod.path.open().readlines() enchanter = HtmlEnchanter(mod) - doc = HTMLDocument() + enc = get_module_encoding(mod.path) + doc = HTMLDocument(enc) for i, row in enumerate(lines): row = enchanter.enchant_row(i + 1, row) doc.add_row(i + 1, row) @@ -248,3 +251,16 @@ ) return h.unicode() +_reg_enc = py.std.re.compile(r'coding[:=]\s*([-\w.]+)') +def get_module_encoding(path): + if hasattr(path, 'strpath'): + path = path.strpath + if path[-1] in ['c', 'o']: + path = path[:-1] + fpath = py.path.local(path) + code = fpath.read() + match = _reg_enc.search(code) + if match: + return match.group(1) + return 'ISO-8859-1' + Modified: py/trunk/py/apigen/source/testing/test_html.py ============================================================================== --- py/trunk/py/apigen/source/testing/test_html.py (original) +++ py/trunk/py/apigen/source/testing/test_html.py Tue Jan 30 14:24:27 2007 @@ -1,9 +1,12 @@ +# -*- coding: UTF-8 -*- """ test of html generation """ -from py.__.apigen.source.html import create_html, HTMLDocument +from py.__.apigen.source.html import prepare_line, create_html, HTMLDocument, \ + get_module_encoding from py.__.apigen.source.browser import parse_path +from py.__.apigen.source.color import Tokenizer, PythonSchema from py.xml import html import py @@ -49,7 +52,7 @@ class _HTMLDocument(HTMLDocument): def __init__(self): - pass + self.encoding = 'ascii' class TestHTMLDocument(object): def test_head(self): @@ -73,51 +76,8 @@ assert isinstance(tbody, html.tbody) assert tbody == table[0] - def prepare_line(self, line, doc=None): - if doc is None: - doc = HTMLDocument() - l = doc.prepare_line(line) - return ''.join([unicode(i) for i in l]) - - def test_prepare_line_basic(self): - result = self.prepare_line(['see if this works']) - assert result == 'see if this works' - result = self.prepare_line(['see if this ', - html.a('works', name='works'),' too']) - assert result == ('see if this ' - 'works too') - result = self.prepare_line(['see if something else works']) - assert result == ('see if something ' - 'else works') - result = self.prepare_line(['see if something ', - html.a('else', name='else'), ' works too']) - assert result == ('see if something ' - 'else works too') - - def test_prepare_line_strings(self): - result = self.prepare_line(['foo = "bar"']) - assert result == 'foo = "bar"' - - result = self.prepare_line(['"spam"']) - assert result == '"spam"' - - # test multiline strings - doc = HTMLDocument() - result = self.prepare_line(['"""start of multiline'], doc) - assert result == ('"""start of ' - 'multiline') - # doc should now be in 'string mode' - result = self.prepare_line(['see if it doesn\'t touch this'], doc) - assert result == ('see if it doesn't touch ' - 'this') - result = self.prepare_line(['"""'], doc) - assert result == '"""' - result = self.prepare_line(['see if it colours this again'], doc) - assert result == ('see if it colours ' - 'this again') - def test_add_row(self): - doc = HTMLDocument() + doc = HTMLDocument('ascii') doc.add_row(1, ['""" this is a foo implementation """']) doc.add_row(2, ['']) doc.add_row(3, ['class ', html.a('Foo', name='Foo'), ':']) @@ -141,9 +101,79 @@ '') def test_unicode(self): - doc = HTMLDocument() + doc = HTMLDocument('ascii') h = unicode(doc) print h assert py.std.re.match(r'\s*\s*[^<]+' '.*\w*$', h, py.std.re.S) +def prepare_line_helper(line, tokenizer=None, encoding='ascii'): + if tokenizer is None: + tokenizer = Tokenizer(PythonSchema) + l = prepare_line(line, tokenizer, encoding) + return ''.join([unicode(i) for i in l]) + +def test_prepare_line_basic(): + result = prepare_line_helper(['see if this works']) + assert result == 'see if this works' + result = prepare_line_helper(['see if this ', + html.a('works', name='works'),' too']) + assert result == ('see if this ' + 'works too') + result = prepare_line_helper(['see if something else works']) + assert result == ('see if something ' + 'else works') + result = prepare_line_helper(['see if something ', + html.a('else', name='else'), ' works too']) + assert result == ('see if something ' + 'else works too') + +def test_prepare_line_strings(): + result = prepare_line_helper(['foo = "bar"']) + assert result == 'foo = "bar"' + + result = prepare_line_helper(['"spam"']) + assert result == '"spam"' + +def test_prepare_line_multiline_strings(): + # test multiline strings + t = Tokenizer(PythonSchema) + result = prepare_line_helper(['"""start of multiline'], t) + assert result == ('"""start of ' + 'multiline') + result = prepare_line_helper(['see if it doesn\'t touch this'], t) + assert result == ('see if it doesn't touch ' + 'this') + result = prepare_line_helper(['"""'], t) + assert result == '"""' + result = prepare_line_helper(['see if it colours this again'], t) + assert result == ('see if it colours ' + 'this again') + +def test_prepare_line_nonascii(): + result = prepare_line_helper(['"f??"'], encoding='UTF-8') + assert (result == + unicode('"f??"', 'UTF-8')) + +def test_get_encoding_ascii(): + temp = py.test.ensuretemp('test_get_encoding') + fpath = temp.join('ascii.py') + fpath.write(str(py.code.Source("""\ + def foo(): + return 'foo' + """))) + # XXX I think the specs say we have to assume latin-1 here... + assert get_module_encoding(fpath.strpath) == 'ISO-8859-1' + +def test_get_encoding_for_real(): + temp = py.test.ensuretemp('test_get_encoding') + fpath = temp.join('utf-8.py') + fpath.write(str(py.code.Source("""\ + #!/usr/bin/env python + # -*- coding: UTF-8 -*- + + def foo(): + return 'f??' + """))) + assert get_module_encoding(fpath.strpath) == 'UTF-8' + Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Tue Jan 30 14:24:27 2007 @@ -38,6 +38,8 @@ return 'bar' def baz(qux): return qux + def _hidden(): + return 'quux' """)) temp.ensure("pak/__init__.py").write(py.code.Source("""\ from py.initpkg import initpkg @@ -77,6 +79,8 @@ ''') c = compile(str(source), '', 'exec') exec c in globals() + + assert pak.somenamespace._hidden() == 'quux' """)) return temp, 'pak' Modified: py/trunk/py/apigen/todo-apigen.txt ============================================================================== --- py/trunk/py/apigen/todo-apigen.txt (original) +++ py/trunk/py/apigen/todo-apigen.txt Tue Jan 30 14:24:27 2007 @@ -1,5 +1,5 @@ -* format docstrings more nicely (with tests) +* format docstrings more nicely (with tests) - DONE I guess * have the API function view be as informative as possible without having to go to the "single method" view @@ -10,7 +10,9 @@ viewed. method views (when navigating there through the class view) should also have the source there -* have class-level attributes be displayed + DONE I guess (todo: add syntax coloring) + +* have class-level attributes be displayed * use "inherited" doc strings, i.e. for class A: @@ -30,11 +32,11 @@ be separately tested and the caller should not need to guess what it will get, i think) + DONE + * look out for and streamline all apigen/source-viewer documentation into one document - - * consider automating dependencies: e.g. something like: queue_render(page, fspath, linker, ...) @@ -61,8 +63,22 @@ ... raise ... + NOT SURE if this is still required + * also we might have a support function for tests that fills the linker with "dummy hrefs" for certain types like source links + + KIND OF DONE, the tests now use a linker that just doesn't + barf on non-existing linkids anymore, which seems to be + good enough (we may want to add more sophisticated debugging + later, but for now this works) -* XXX list more here +* add syntax coloring for Python source snippets + +* remove py.test/apigen cruft from stack traces + +* fix non-ascii source encoding support + +* XXX + From hpk at codespeak.net Tue Jan 30 14:38:50 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 30 Jan 2007 14:38:50 +0100 (CET) Subject: [py-svn] r37595 - py/dist/py/test/terminal Message-ID: <20070130133850.EA51B10080@code0.codespeak.net> Author: hpk Date: Tue Jan 30 14:38:49 2007 New Revision: 37595 Modified: py/dist/py/test/terminal/remote.py Log: waiting longer for re-checking on modified files Modified: py/dist/py/test/terminal/remote.py ============================================================================== --- py/dist/py/test/terminal/remote.py (original) +++ py/dist/py/test/terminal/remote.py Tue Jan 30 14:38:49 2007 @@ -135,7 +135,7 @@ while 1: if config.option.looponfailing and (failures or not wasfailing): while not checkpyfilechange(rootdir): - py.std.time.sleep(0.4) + py.std.time.sleep(2.4) wasfailing = len(failures) failures = failure_master(config.option.executable, out, args, failures) if not config.option.looponfailing: From hpk at codespeak.net Tue Jan 30 14:44:53 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 30 Jan 2007 14:44:53 +0100 (CET) Subject: [py-svn] r37596 - py/trunk/py/test/terminal Message-ID: <20070130134453.0407610080@code0.codespeak.net> Author: hpk Date: Tue Jan 30 14:44:52 2007 New Revision: 37596 Modified: py/trunk/py/test/terminal/remote.py Log: bah, waiting longer also in py-trunk Modified: py/trunk/py/test/terminal/remote.py ============================================================================== --- py/trunk/py/test/terminal/remote.py (original) +++ py/trunk/py/test/terminal/remote.py Tue Jan 30 14:44:52 2007 @@ -76,7 +76,7 @@ while 1: if self.config.option.looponfailing and (failures or not wasfailing): while not checkpyfilechange(rootdir): - py.std.time.sleep(0.4) + py.std.time.sleep(2.4) wasfailing = len(failures) failures = self.run_remote_session(failures) if not self.config.option.looponfailing: From hpk at codespeak.net Tue Jan 30 15:02:29 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 30 Jan 2007 15:02:29 +0100 (CET) Subject: [py-svn] r37598 - in py/trunk/py/test: . testing tkinter Message-ID: <20070130140229.CE59C1008A@code0.codespeak.net> Author: hpk Date: Tue Jan 30 15:02:28 2007 New Revision: 37598 Removed: py/trunk/py/test/tkinter/ Modified: py/trunk/py/test/config.py py/trunk/py/test/defaultconftest.py py/trunk/py/test/testing/test_config.py Log: removing broken tkinter session support ahead of the 0.9 release (might be re-introduced later) Modified: py/trunk/py/test/config.py ============================================================================== --- py/trunk/py/test/config.py (original) +++ py/trunk/py/test/config.py Tue Jan 30 15:02:28 2007 @@ -150,8 +150,6 @@ name = 'TerminalSession' if self.option.dist: name = 'RSession' - elif self.option.tkinter: - name = 'TkinterSession' else: optnames = 'startserver runbrowser apigen restreport boxing'.split() for opt in optnames: @@ -253,8 +251,6 @@ # default import paths for sessions -TkinterSession = 'py.__.test.tkinter.reportsession' -TerminalSession = 'py.__.test.terminal.terminal' TerminalSession = 'py.__.test.terminal.terminal' RemoteTerminalSession = 'py.__.test.terminal.remote' RSession = 'py.__.test.rsession.rsession' Modified: py/trunk/py/test/defaultconftest.py ============================================================================== --- py/trunk/py/test/defaultconftest.py (original) +++ py/trunk/py/test/defaultconftest.py Tue Jan 30 15:02:28 2007 @@ -86,9 +86,6 @@ action="store_true", dest="runbrowser", default=False, help="run browser (implies --startserver)." ), - Option('', '--tkinter', - action="store_true", dest="tkinter", default=False, - help="use tkinter test session frontend."), Option('', '--box', action="store_true", dest="boxing", help="use boxing (running each test in external process)"), Modified: py/trunk/py/test/testing/test_config.py ============================================================================== --- py/trunk/py/test/testing/test_config.py (original) +++ py/trunk/py/test/testing/test_config.py Tue Jan 30 15:02:28 2007 @@ -224,11 +224,6 @@ config = py.test.config._reparse([self.tmpdir, '--dist', '--exec=x']) assert config._getsessionname() == 'RSession' - def test_tkintersession(self): - config = py.test.config._reparse([self.tmpdir, '--tkinter']) - assert config._getsessionname() == 'TkinterSession' - config = py.test.config._reparse([self.tmpdir, '--dist']) - def test_sessionname_lookup_custom(self): self.tmpdir.join("conftest.py").write(py.code.Source(""" from py.__.test.session import Session From hpk at codespeak.net Tue Jan 30 15:08:48 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 30 Jan 2007 15:08:48 +0100 (CET) Subject: [py-svn] r37599 - py/trunk/py/apigen Message-ID: <20070130140848.9BD6810089@code0.codespeak.net> Author: hpk Date: Tue Jan 30 15:08:47 2007 New Revision: 37599 Modified: py/trunk/py/apigen/htmlgen.py Log: fixing a windows-error: i believe that most strings passed into htmlgen.deindent() actually have a normalized '\n' line-ending already (e.g. if they come from python docstrings). So the caller now needs to specify otherwise. Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Tue Jan 30 15:08:47 2007 @@ -12,7 +12,7 @@ html = py.xml.html raw = py.xml.raw -def deindent(str, linesep=os.linesep): +def deindent(str, linesep='\n'): """ de-indent string can be used to de-indent Python docstrings, it de-indents the first @@ -26,7 +26,7 @@ # replace tabs with spaces, empty lines that contain spaces only, and # find out what the smallest indentation is for line in lines[1:]: - line = line.replace('\t', ' ') + line = line.replace('\t', ' ' * 4) stripped = line.strip() if not stripped: normalized.append('') From guido at codespeak.net Tue Jan 30 15:46:59 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 15:46:59 +0100 (CET) Subject: [py-svn] r37602 - in py/trunk/py/apigen/source: . testing Message-ID: <20070130144659.4AC211008F@code0.codespeak.net> Author: guido Date: Tue Jan 30 15:46:57 2007 New Revision: 37602 Modified: py/trunk/py/apigen/source/color.py py/trunk/py/apigen/source/html.py py/trunk/py/apigen/source/testing/test_color.py Log: Fixed support for files ending on a comment rather than a newline, fixed some unicode() call so it's not done on objects that are already unicode. Modified: py/trunk/py/apigen/source/color.py ============================================================================== --- py/trunk/py/apigen/source/color.py (original) +++ py/trunk/py/apigen/source/color.py Tue Jan 30 15:46:57 2007 @@ -4,7 +4,7 @@ class PythonSchema(object): """ contains information for syntax coloring """ - comment = [('#', '\n')] + comment = [('#', '\n'), ('#', '$')] multiline_string = ['"""', "'''"] string = ['"""', "'''", '"', "'"] # XXX not complete @@ -125,7 +125,6 @@ break return data, token - def _check_comments(self, data): # fortunately we don't have to deal with multi-line comments token = None Modified: py/trunk/py/apigen/source/html.py ============================================================================== --- py/trunk/py/apigen/source/html.py (original) +++ py/trunk/py/apigen/source/html.py Tue Jan 30 15:46:57 2007 @@ -46,7 +46,10 @@ if type(item) in [str, unicode]: tokens = tokenizer.tokenize(item) for t in tokens: - data = unicode(t.data, encoding) + if not isinstance(t.data, unicode): + data = unicode(t.data, encoding) + else: + data = t.data if t.type in ['keyword', 'alt_keyword', 'number', 'string', 'comment']: ret.append(html.span(data, class_=t.type)) Modified: py/trunk/py/apigen/source/testing/test_color.py ============================================================================== --- py/trunk/py/apigen/source/testing/test_color.py (original) +++ py/trunk/py/apigen/source/testing/test_color.py Tue Jan 30 15:46:57 2007 @@ -45,8 +45,12 @@ assert self.tokens('foo # bar\n') == [Token('foo', type='word'), Token(' ', type='whitespace'), Token('# bar\n', type='comment')] + assert self.tokens("# foo 'bar\n") == [Token("# foo 'bar\n", + type='comment')] + assert self.tokens('# foo') == [Token('# foo', type='comment')] def test_string_simple(self): + assert self.tokens('""') == [Token('""', type='string')] assert self.tokens('"foo"') == [Token('"foo"', type='string')] assert self.tokens('"foo"\'bar\'') == [Token('"foo"', type='string'), Token("'bar'", type='string')] From guido at codespeak.net Tue Jan 30 16:42:22 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 16:42:22 +0100 (CET) Subject: [py-svn] r37608 - in py/trunk/py/xmlobj: . testing Message-ID: <20070130154222.95EEC100B5@code0.codespeak.net> Author: guido Date: Tue Jan 30 16:42:19 2007 New Revision: 37608 Modified: py/trunk/py/xmlobj/html.py py/trunk/py/xmlobj/testing/test_html.py py/trunk/py/xmlobj/testing/test_xml.py py/trunk/py/xmlobj/visit.py Log: Added some code to make sure 'inline' elements aren't indented (gotta love 'ignorable' whitespace). Modified: py/trunk/py/xmlobj/html.py ============================================================================== --- py/trunk/py/xmlobj/html.py (original) +++ py/trunk/py/xmlobj/html.py Tue Jan 30 16:42:19 2007 @@ -10,6 +10,10 @@ single = dict([(x, 1) for x in ('br,img,area,param,col,hr,meta,link,base,' 'input,frame').split(',')]) + inline = dict([(x, 1) for x in + ('a abbr acronym b basefont bdo big br cite code dfn em font ' + 'i img input kbd label q s samp select small span strike ' + 'strong sub sup textarea tt u var'.split(' '))]) def repr_attribute(self, attrs, name): if name == 'class_': @@ -21,6 +25,9 @@ def _issingleton(self, tagname): return tagname in self.single + def _isinline(self, tagname): + return tagname in self.inline + class HtmlTag(Tag): def unicode(self, indent=2): l = [] Modified: py/trunk/py/xmlobj/testing/test_html.py ============================================================================== --- py/trunk/py/xmlobj/testing/test_html.py (original) +++ py/trunk/py/xmlobj/testing/test_html.py Tue Jan 30 16:42:19 2007 @@ -46,3 +46,9 @@ h = html.head(html.script(src="foo")) assert unicode(h) == '' + +def test_inline(): + h = html.div(html.span('foo'), html.span('bar')) + assert (h.unicode(indent=2) == + '

foobar

') + Modified: py/trunk/py/xmlobj/testing/test_xml.py ============================================================================== --- py/trunk/py/xmlobj/testing/test_xml.py (original) +++ py/trunk/py/xmlobj/testing/test_xml.py Tue Jan 30 16:42:19 2007 @@ -55,3 +55,4 @@ x = ns.some(py.xml.raw("

literal

")) u = unicode(x) assert u == "

literal

" + Modified: py/trunk/py/xmlobj/visit.py ============================================================================== --- py/trunk/py/xmlobj/visit.py (original) +++ py/trunk/py/xmlobj/visit.py Tue Jan 30 16:42:19 2007 @@ -50,7 +50,7 @@ tag.parent = None self.visited[id(tag)] = 1 tagname = getattr(tag, 'xmlname', tag.__class__.__name__) - if self.curindent: + if self.curindent and not self._isinline(tagname): self.write("\n" + u' ' * self.curindent) if tag: self.curindent += self.indent @@ -100,3 +100,7 @@ """can (and will) be overridden in subclasses""" return self.shortempty + def _isinline(self, tagname): + """can (and will) be overridden in subclasses""" + return False + From guido at codespeak.net Tue Jan 30 16:43:01 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 16:43:01 +0100 (CET) Subject: [py-svn] r37609 - py/trunk/py/rest/testing Message-ID: <20070130154301.4F3E9100B7@code0.codespeak.net> Author: guido Date: Tue Jan 30 16:43:00 2007 New Revision: 37609 Modified: py/trunk/py/rest/testing/test_transform.py Log: Oops, forgot to check this in: update to deal with change in py.xml.html. Modified: py/trunk/py/rest/testing/test_transform.py ============================================================================== --- py/trunk/py/rest/testing/test_transform.py (original) +++ py/trunk/py/rest/testing/test_transform.py Tue Jan 30 16:43:00 2007 @@ -22,8 +22,7 @@ '

foo\tbar

'), (Rest(Paragraph(Link('foo', 'http://www.foo.com/'))), - ('

\n foo' - '

'))): + '

foo

')): html = convert_to_html(rest) assert html == expected From guido at codespeak.net Tue Jan 30 16:44:32 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 16:44:32 +0100 (CET) Subject: [py-svn] r37610 - py/trunk/py/apigen Message-ID: <20070130154432.C6261100B6@code0.codespeak.net> Author: guido Date: Tue Jan 30 16:44:30 2007 New Revision: 37610 Modified: py/trunk/py/apigen/htmlgen.py Log: Stack trace code snippets are now syntax colored. Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Tue Jan 30 16:44:30 2007 @@ -4,6 +4,7 @@ from py.__.apigen.layout import LayoutPage from py.__.apigen.source import browser as source_browser from py.__.apigen.source import html as source_html +from py.__.apigen.source import color as source_color from py.__.apigen.tracer.description import is_private from py.__.apigen.rest.genrest import split_of_last_part from py.__.apigen.linker import relpath @@ -356,17 +357,21 @@ callable_source = self.dsa.get_function_source(dotted_name) # i assume they're both either available or unavailable(XXX ?) is_in_pkg = self.is_in_pkg(sourcefile) - if is_in_pkg and sourcefile and callable_source: - csource = H.div(H.br(), - H.a('source: %s' % (sourcefile,), - href=self.linker.get_lazyhref(sourcefile)), - H.br(), - H.SourceDef(H.pre(unicode(callable_source, 'UTF-8')))) - elif not is_in_pkg and sourcefile and callable_source: - csource = H.div(H.br(), - H.em('source: %s' % (sourcefile,)), - H.br(), - H.SourceDef(H.pre(unicode(callable_source, 'UTF-8')))) + if sourcefile and callable_source: + enc = source_html.get_module_encoding(sourcefile) + if is_in_pkg: + csource = H.div(H.br(), + H.a('source: %s' % (sourcefile,), + href=self.linker.get_lazyhref(sourcefile)), + H.br(), + H.SourceDef(H.pre(unicode(callable_source, + enc)))) + elif not is_in_pkg: + csource = H.div(H.br(), + H.em('source: %s' % (sourcefile,)), + H.br(), + H.SourceDef(H.pre(unicode(callable_source, + enc)))) else: csource = H.SourceDef('could not get source file') @@ -693,30 +698,45 @@ _reg_source = py.std.re.compile(r'([^>]*)<(.*)>') def gen_traceback(self, funcname, call_site): tbdiv = H.div() - for line in call_site: - lineno = line.lineno - line.firstlineno - source = line.source - sourcefile = line.filename + for frame in call_site: + lineno = frame.lineno - frame.firstlineno + source = frame.source + sourcefile = frame.filename + + tokenizer = source_color.Tokenizer(source_color.PythonSchema) mangled = [] for i, sline in enumerate(str(source).split('\n')): if i == lineno: - l = '-> %s' % (unicode(sline, 'UTF-8'),) + l = '-> %s' % (sline,) else: - l = ' %s' % (unicode(sline, 'UTF-8'),) + l = ' %s' % (sline,) mangled.append(l) if sourcefile: - linktext = '%s - line %s' % (sourcefile, line.lineno + 1) + linktext = '%s - line %s' % (sourcefile, frame.lineno + 1) # skip py.code.Source objects and source files outside of the # package is_code_source = self._reg_source.match(sourcefile) if (not is_code_source and self.is_in_pkg(sourcefile)): + enc = source_html.get_module_encoding(sourcefile) href = self.linker.get_lazyhref(sourcefile) sourcelink = H.a(linktext, href=href) else: + enc = 'latin-1' sourcelink = H.div(linktext) + colored = [] + for i, line in enumerate(mangled): + try: + colored.append(H.span('%02s: ' % + (i + frame.firstlineno + 1))) + colored.append(source_html.prepare_line( + [line], tokenizer, enc)) + colored.append('\n') + except py.error.ENOENT: + colored = mangled + break else: sourcelink = H.div('source unknown') tbdiv.append(sourcelink) - tbdiv.append(H.pre('\n'.join(mangled))) + tbdiv.append(H.div(class_='code', *colored)) return tbdiv From hpk at codespeak.net Tue Jan 30 17:28:44 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 30 Jan 2007 17:28:44 +0100 (CET) Subject: [py-svn] r37615 - py/trunk/py/apigen/testing Message-ID: <20070130162844.C8B18100C5@code0.codespeak.net> Author: hpk Date: Tue Jan 30 17:28:43 2007 New Revision: 37615 Modified: py/trunk/py/apigen/testing/test_apigen_functional.py Log: skip this test on windows, it should work but doesn't and it's not too important (apigen does not fully run on win32 because of LSession not working there) Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Tue Jan 30 17:28:43 2007 @@ -94,6 +94,8 @@ 'main.sub.func', 'somenamespace.baz', 'somenamespace.foo'] def test_apigen_functional(): + if py.std.sys.platform == "win32": + py.test.skip("XXX test fails on windows") fs_root, package_name = setup_fs_project('test_apigen_functional') tempdir = py.test.ensuretemp('test_apigen_functional_results') pydir = py.magic.autopath().dirpath().dirpath().dirpath() From guido at codespeak.net Tue Jan 30 17:29:36 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 17:29:36 +0100 (CET) Subject: [py-svn] r37616 - in py/trunk/py/apigen: . testing Message-ID: <20070130162936.A81A8100C8@code0.codespeak.net> Author: guido Date: Tue Jan 30 17:29:33 2007 New Revision: 37616 Modified: py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/style.css py/trunk/py/apigen/testing/test_apigen_example.py Log: All code snippets are colored now, also properly fixed hiding of _* names in the navigation. Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Tue Jan 30 17:29:33 2007 @@ -332,6 +332,20 @@ reltargetpath = outputpath.relto(self.base).replace(os.path.sep, '/') self.write_page(title, reltargetpath, project, tag, nav) +def enumerate_and_color(codelines, firstlineno, enc): + tokenizer = source_color.Tokenizer(source_color.PythonSchema) + colored = [] + for i, line in enumerate(codelines): + try: + colored.append(H.span('%04s: ' % (i + firstlineno + 1))) + colored.append(source_html.prepare_line([line], tokenizer, enc)) + colored.append('\n') + except py.error.ENOENT: + # error reading source code, giving up + colored = org + break + return colored + class ApiPageBuilder(AbstractPageBuilder): """ builds the html for an api docs page """ def __init__(self, base, linker, dsa, projroot, namespace_tree): @@ -359,19 +373,17 @@ is_in_pkg = self.is_in_pkg(sourcefile) if sourcefile and callable_source: enc = source_html.get_module_encoding(sourcefile) + tokenizer = source_color.Tokenizer(source_color.PythonSchema) + firstlineno = func.func_code.co_firstlineno + org = callable_source.split('\n') + colored = enumerate_and_color(org, firstlineno, enc) if is_in_pkg: - csource = H.div(H.br(), - H.a('source: %s' % (sourcefile,), - href=self.linker.get_lazyhref(sourcefile)), - H.br(), - H.SourceDef(H.pre(unicode(callable_source, - enc)))) - elif not is_in_pkg: - csource = H.div(H.br(), - H.em('source: %s' % (sourcefile,)), - H.br(), - H.SourceDef(H.pre(unicode(callable_source, - enc)))) + slink = H.a('source: %s' % (sourcefile,), + href=self.linker.get_lazyhref(sourcefile)) + else: + slink = H.em('source: %s' % (sourcefile,)) + csource = H.div(H.br(), slink, H.br(), + H.SourceDef(H.div(class_='code', *colored))) else: csource = H.SourceDef('could not get source file') @@ -465,8 +477,6 @@ H.Docstring(docstring or '*no docstring available*') ) for dotted_name in sorted(item_dotted_names): - if dotted_name.startswith('_'): - continue itemname = dotted_name.split('.')[-1] if is_private(itemname): continue @@ -583,9 +593,11 @@ for dn in sorted(siblings): selected = dn == '.'.join(path) sibpath = dn.split('.') - navitems.append(build_navitem_html(self.linker, sibpath[-1], - dn, depth, - selected)) + sibname = sibpath[-1] + if is_private(sibname): + continue + navitems.append(build_navitem_html(self.linker, sibname, + dn, depth, selected)) if selected: lastlevel = dn.count('.') == dotted_name.count('.') if not lastlevel: @@ -723,17 +735,7 @@ else: enc = 'latin-1' sourcelink = H.div(linktext) - colored = [] - for i, line in enumerate(mangled): - try: - colored.append(H.span('%02s: ' % - (i + frame.firstlineno + 1))) - colored.append(source_html.prepare_line( - [line], tokenizer, enc)) - colored.append('\n') - except py.error.ENOENT: - colored = mangled - break + colored = enumerate_and_color(mangled, frame.firstlineno, enc) else: sourcelink = H.div('source unknown') tbdiv.append(sourcelink) Modified: py/trunk/py/apigen/style.css ============================================================================== --- py/trunk/py/apigen/style.css (original) +++ py/trunk/py/apigen/style.css Tue Jan 30 17:29:33 2007 @@ -88,6 +88,8 @@ padding-left: 1em; white-space: pre; font-family: monospace, Monaco; + margin-top: 0.5em; + margin-bottom: 0.5em; } .comment { Modified: py/trunk/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_example.py (original) +++ py/trunk/py/apigen/testing/test_apigen_example.py Tue Jan 30 17:29:33 2007 @@ -63,6 +63,7 @@ 'main.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), 'main.SomeSubClass': ('./somesubclass.py', 'SomeSubClass'), 'other': ('./somenamespace.py', '*'), + '_test': ('./somenamespace.py', '*'), }) """)) return temp, 'pkg' @@ -114,7 +115,8 @@ 'main.SomeSubClass', 'main.SomeInstance', 'other.foo', - 'other.bar']) + 'other.bar', + '_test']) self.namespace_tree = namespace_tree self.apb = ApiPageBuilder(base, linker, self.dsa, self.fs_root.join(self.pkg_name), @@ -195,6 +197,7 @@ def test_build_class_pages_nav_links(self): data = self.apb.prepare_class_pages(['main.SomeSubClass', 'main.SomeClass']) + self.apb.prepare_namespace_pages() # fake some stuff that would be built from other methods self.linker.set_link('', 'api/index.html') self.linker.set_link('main', 'api/main.html') @@ -211,8 +214,8 @@ 'href="main.SomeClass.html">SomeClass', 'href="main.SomeSubClass.html">SomeSubClass', ]) - assert not 'href="main.sub.func.html"' in html - py.test.skip('WOP from here') + assert 'href="main.sub.func.html"' not in html + assert 'href="_test' not in html assert 'href="main.sub.html">sub' in html _checkhtml(html) From fijal at codespeak.net Tue Jan 30 17:54:16 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 30 Jan 2007 17:54:16 +0100 (CET) Subject: [py-svn] r37620 - py/trunk/py/compat Message-ID: <20070130165416.EA02F1009B@code0.codespeak.net> Author: fijal Date: Tue Jan 30 17:54:14 2007 New Revision: 37620 Modified: py/trunk/py/compat/doctest.py Log: ensure 2.5 compatibility Modified: py/trunk/py/compat/doctest.py ============================================================================== --- py/trunk/py/compat/doctest.py (original) +++ py/trunk/py/compat/doctest.py Tue Jan 30 17:54:14 2007 @@ -1324,7 +1324,7 @@ __LINECACHE_FILENAME_RE = re.compile(r'[\w\.]+)' r'\[(?P\d+)\]>$') - def __patched_linecache_getlines(self, filename): + def __patched_linecache_getlines(self, filename, additional_arg=None): m = self.__LINECACHE_FILENAME_RE.match(filename) if m and m.group('name') == self.test.name: example = self.test.examples[int(m.group('examplenum'))] From fijal at codespeak.net Tue Jan 30 17:55:10 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 30 Jan 2007 17:55:10 +0100 (CET) Subject: [py-svn] r37621 - py/trunk/py/doc/future Message-ID: <20070130165510.B5413100A7@code0.codespeak.net> Author: fijal Date: Tue Jan 30 17:55:04 2007 New Revision: 37621 Modified: py/trunk/py/doc/future/planning.txt Log: all tests works for me Modified: py/trunk/py/doc/future/planning.txt ============================================================================== --- py/trunk/py/doc/future/planning.txt (original) +++ py/trunk/py/doc/future/planning.txt Tue Jan 30 17:55:04 2007 @@ -6,8 +6,6 @@ 2.3 - 2.4.2 work -2.5 has obscure problems - with setuptools: 2.3 - 2.4.2 as 'develop' regular installation: works mostly, strange test-failures From fijal at codespeak.net Tue Jan 30 17:57:00 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 30 Jan 2007 17:57:00 +0100 (CET) Subject: [py-svn] r37622 - py/trunk/py/doc/future Message-ID: <20070130165700.043F4100CA@code0.codespeak.net> Author: fijal Date: Tue Jan 30 17:56:58 2007 New Revision: 37622 Modified: py/trunk/py/doc/future/future.txt Log: Don't use previous versions in future examples Modified: py/trunk/py/doc/future/future.txt ============================================================================== --- py/trunk/py/doc/future/future.txt (original) +++ py/trunk/py/doc/future/future.txt Tue Jan 30 17:56:58 2007 @@ -188,8 +188,8 @@ might or should look like:: """ - the py lib version 0.8 - http://codespeak.net/py/0.8 + the py lib version 1.0 + http://codespeak.net/py/1.0 """ from py import pkg From fijal at codespeak.net Tue Jan 30 17:58:14 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 30 Jan 2007 17:58:14 +0100 (CET) Subject: [py-svn] r37623 - py/trunk/py/apigen/tracer Message-ID: <20070130165814.64BE2100C9@code0.codespeak.net> Author: fijal Date: Tue Jan 30 17:58:11 2007 New Revision: 37623 Modified: py/trunk/py/apigen/tracer/description.py Log: Get rid of last frame if possible (the frame containing start_tracing should not be there, unless this is the last frame) Modified: py/trunk/py/apigen/tracer/description.py ============================================================================== --- py/trunk/py/apigen/tracer/description.py (original) +++ py/trunk/py/apigen/tracer/description.py Tue Jan 30 17:58:11 2007 @@ -78,8 +78,11 @@ if upward_frame: if hasattr(upward_frame, 'raw'): upward_frame = upward_frame.raw - return CallStack([py.code.Frame(i) for i in stack[stack.index(frame):\ - stack.index(upward_frame)+1]]) + lst = [py.code.Frame(i) for i in stack[stack.index(frame):\ + stack.index(upward_frame)+1]] + if len(lst) > 1: + return CallStack(lst[:-1]) + return CallStack(lst) return CallStack([py.code.Frame(i) for i in stack[stack.index(frame):]]) ##class CallSite(object): From fijal at codespeak.net Tue Jan 30 17:59:37 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 30 Jan 2007 17:59:37 +0100 (CET) Subject: [py-svn] r37624 - py/trunk/py/test/rsession Message-ID: <20070130165937.35D8E100C9@code0.codespeak.net> Author: fijal Date: Tue Jan 30 17:59:32 2007 New Revision: 37624 Modified: py/trunk/py/test/rsession/executor.py py/trunk/py/test/rsession/local.py Log: Slightly hackish way to put all tracing calls as low as possible. This should kill unnecessary frames. Right now tracing is done only for py.test.Function objects, I don't know what to do with sth else, let's leave it alone. Modified: py/trunk/py/test/rsession/executor.py ============================================================================== --- py/trunk/py/test/rsession/executor.py (original) +++ py/trunk/py/test/rsession/executor.py Tue Jan 30 17:59:32 2007 @@ -18,10 +18,13 @@ self.reporter = reporter self.config = config assert self.config + + def run(self): + self.item.run() def execute(self): try: - self.item.run() + self.run() outcome = Outcome() except py.test.Item.Skipped, e: outcome = Outcome(skipped=str(e)) @@ -49,8 +52,33 @@ outcome.stderr = "" return outcome +class ApigenExecutor(RunExecutor): + """ Same as RunExecutor, but takes tracer to trace calls as + an argument to execute + """ + def execute(self, tracer): + self.tracer = tracer + return super(ApigenExecutor, self).execute() + + def wrap_underlaying(self, target): + def f(*args): + try: + self.tracer.start_tracing() + return target(*args) + finally: + self.tracer.end_tracing() + return f + + def run(self): + """ We want to trace *only* function objects here. Unsure + what to do with custom collectors at all + """ + if hasattr(self.item, 'obj') and type(self.item.obj) is py.test.Function: + self.item.obj = self.wrap_underlaying(self.item.obj) + self.item.run() + class BoxExecutor(RunExecutor): - """ Same as run executor, but boxes test instead + """ Same as RunExecutor, but boxes test instead """ wraps = True Modified: py/trunk/py/test/rsession/local.py ============================================================================== --- py/trunk/py/test/rsession/local.py (original) +++ py/trunk/py/test/rsession/local.py Tue Jan 30 17:59:32 2007 @@ -2,7 +2,8 @@ """ local-only operations """ -from py.__.test.rsession.executor import BoxExecutor, RunExecutor +from py.__.test.rsession.executor import BoxExecutor, RunExecutor,\ + ApigenExecutor from py.__.test.rsession import report from py.__.test.rsession.outcome import ReprOutcome @@ -37,13 +38,10 @@ raise NotImplementedError() def apigen_runner(item, session, reporter): - r = RunExecutor(item, reporter=reporter, config=session.config) startcapture(session) #retval = plain_runner(item, session, reporter) - r = RunExecutor(item, reporter=reporter, config=session.config) - session.tracer.start_tracing() - outcome = r.execute() - session.tracer.end_tracing() + r = ApigenExecutor(item, reporter=reporter, config=session.config) + outcome = r.execute(session.tracer) outcome = ReprOutcome(outcome.make_repr(session.config.option.tbstyle)) outcome.stdout, outcome.stderr = finishcapture(session) return outcome From fijal at codespeak.net Tue Jan 30 18:55:10 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 30 Jan 2007 18:55:10 +0100 (CET) Subject: [py-svn] r37631 - py/trunk/py/test Message-ID: <20070130175510.11EFE100CC@code0.codespeak.net> Author: fijal Date: Tue Jan 30 18:55:08 2007 New Revision: 37631 Modified: py/trunk/py/test/conftesthandle.py Log: Kill unnecessarry cache Modified: py/trunk/py/test/conftesthandle.py ============================================================================== --- py/trunk/py/test/conftesthandle.py (original) +++ py/trunk/py/test/conftesthandle.py Tue Jan 30 18:55:08 2007 @@ -11,7 +11,6 @@ """ def __init__(self, path=None): self._path2confmods = {} - self._path2conftest_files = {} # direct cache of conftest files, to avoid confusion if path is not None: self.setinitial([path]) @@ -55,12 +54,14 @@ def getconftest(self, path): """ Return a direct module of that path """ + if isinstance(path, str): + path = py.path.local(path) try: - return self._path2conftest_files[path] + conftestmod = self.getconftestmodules(path)[-1] + if py.path.local(conftestmod.__file__).dirpath() != path: + raise AttributeError + return conftestmod except KeyError: - conftestpath = path.join("conftest.py") - if conftestpath.check(file=1): - return self.importconfig(conftestpath) raise AttributeError # we raise here AttributeError to unify error reporting in case # of lack of variable in conftest or lack of file, but we do not want to @@ -99,5 +100,4 @@ mod = configpath.pyimport(modname=modname) else: mod = configpath.pyimport() - self._path2conftest_files[configpath.dirpath()] = mod return mod From guido at codespeak.net Tue Jan 30 21:45:22 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 21:45:22 +0100 (CET) Subject: [py-svn] r37637 - in py/trunk/py/apigen: . testing Message-ID: <20070130204522.481AD100A9@code0.codespeak.net> Author: guido Date: Tue Jan 30 21:45:18 2007 New Revision: 37637 Modified: py/trunk/py/apigen/htmlgen.py py/trunk/py/apigen/linker.py py/trunk/py/apigen/testing/test_apigen_functional.py Log: Fixed Windows path problems for apigen; test_apigen_functional.py now works (couldn't test with the py lib itself, though, as it wants to build greenlets and i don't have a suitable c compiler installed). Modified: py/trunk/py/apigen/htmlgen.py ============================================================================== --- py/trunk/py/apigen/htmlgen.py (original) +++ py/trunk/py/apigen/htmlgen.py Tue Jan 30 21:45:18 2007 @@ -193,9 +193,9 @@ class AbstractPageBuilder(object): def write_page(self, title, reltargetpath, project, tag, nav): targetpath = self.base.join(reltargetpath) - stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), + stylesheeturl = relpath('%s%s' % (targetpath.dirpath(), os.path.sep), self.base.join('style.css').strpath) - scripturls = [relpath('%s/' % (targetpath.dirpath(),), + scripturls = [relpath('%s%s' % (targetpath.dirpath(), os.path.sep), self.base.join('api.js').strpath)] page = wrap_page(project, title, tag, nav, self.base, stylesheeturl, scripturls) Modified: py/trunk/py/apigen/linker.py ============================================================================== --- py/trunk/py/apigen/linker.py (original) +++ py/trunk/py/apigen/linker.py Tue Jan 30 21:45:18 2007 @@ -42,7 +42,7 @@ finally: del self.fromlocation -def relpath(p1, p2, sep='/', back='..', normalize=True): +def relpath(p1, p2, sep=os.path.sep, back='..', normalize=True): """ create a relative path from p1 to p2 sep is the seperator used for input and (depending Modified: py/trunk/py/apigen/testing/test_apigen_functional.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_functional.py (original) +++ py/trunk/py/apigen/testing/test_apigen_functional.py Tue Jan 30 21:45:18 2007 @@ -94,8 +94,8 @@ 'main.sub.func', 'somenamespace.baz', 'somenamespace.foo'] def test_apigen_functional(): - if py.std.sys.platform == "win32": - py.test.skip("XXX test fails on windows") + #if py.std.sys.platform == "win32": + # py.test.skip("XXX test fails on windows") fs_root, package_name = setup_fs_project('test_apigen_functional') tempdir = py.test.ensuretemp('test_apigen_functional_results') pydir = py.magic.autopath().dirpath().dirpath().dirpath() From guido at codespeak.net Tue Jan 30 21:52:00 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 21:52:00 +0100 (CET) Subject: [py-svn] r37638 - py/trunk/py/apigen/testing Message-ID: <20070130205200.18726100B0@code0.codespeak.net> Author: guido Date: Tue Jan 30 21:51:57 2007 New Revision: 37638 Modified: py/trunk/py/apigen/testing/test_apigen_example.py Log: Re-enabled the tests on win32 Modified: py/trunk/py/apigen/testing/test_apigen_example.py ============================================================================== --- py/trunk/py/apigen/testing/test_apigen_example.py (original) +++ py/trunk/py/apigen/testing/test_apigen_example.py Tue Jan 30 21:51:57 2007 @@ -8,10 +8,6 @@ from py.__.test.web import webcheck from py.__.apigen.conftest import option -def setup_module(mod): - if py.std.sys.platform == "win32": - py.test.skip("apigen does not fully support win32 yet") - def run_string_sequence_test(data, seq): currpos = -1 for s in seq: From guido at codespeak.net Tue Jan 30 23:00:34 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 23:00:34 +0100 (CET) Subject: [py-svn] r37639 - py/trunk/py/doc Message-ID: <20070130220034.B43E710093@code0.codespeak.net> Author: guido Date: Tue Jan 30 23:00:33 2007 New Revision: 37639 Modified: py/trunk/py/doc/conftest.py Log: Not sure why this was here... :| Modified: py/trunk/py/doc/conftest.py ============================================================================== --- py/trunk/py/doc/conftest.py (original) +++ py/trunk/py/doc/conftest.py Tue Jan 30 23:00:33 2007 @@ -98,10 +98,7 @@ linesep = '\r' else: linesep = '\r\n' - print 'linesep:', repr(linesep) s = s.replace(linesep, '\n') - self.fspath.write(s) - print 's:', repr(s) return s class LinkCheckerMaker(py.test.collect.Collector): From guido at codespeak.net Tue Jan 30 23:01:05 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 30 Jan 2007 23:01:05 +0100 (CET) Subject: [py-svn] r37640 - py/trunk/py/doc Message-ID: <20070130220105.8CF0D1009D@code0.codespeak.net> Author: guido Date: Tue Jan 30 23:01:04 2007 New Revision: 37640 Added: py/trunk/py/doc/path.txt Log: Added first bits of a document about py.path. Added: py/trunk/py/doc/path.txt ============================================================================== --- (empty file) +++ py/trunk/py/doc/path.txt Tue Jan 30 23:01:04 2007 @@ -0,0 +1,109 @@ +======= +py.path +======= + +.. contents:: +.. sectnum:: + +The 'py' lib provides an elegant, high-level api to deal with filesystems +and filesystem-like interfaces: :api:`py.path`. Here a simple but powerful +interface to deal with object trees (reading from and writing to nodes, adding +nodes and examining the structure, etc.) in a filesystem-oriented way is +defined, along with a number of readily available implementations. + +source: :source:`py/path/` + +Path implementations provided by :api:`py.path` +=============================================== + +:api:`py.path.local` +-------------------- + +The first and most obvious of the implementations is a wrapper around a local +filesystem. It's just a bit nicer in usage than the regular Python APIs, and +of course all the functionality is bundled together rather than spread over a +number of modules. + +Example usage, here we use the :api:`py.test.ensuretemp()` function to create +a :api:`py.path.local` object for us (which wraps a directory):: + + >>> import py + >>> temppath = py.test.ensuretemp('py.path_documentation') + >>> foopath = temppath.join('foo') # get child 'foo' (lazily) + >>> foopath.check() # check if child 'foo' exists + False + >>> foopath.write('bar') # write some data to it + >>> foopath.check() + True + >>> foopath.read() + 'bar' + +:api:`py.path.svnurl` and :api:`py.path.svnwc` +---------------------------------------------- + +Two other :api:`py.path` implementations that the py lib provides wrap the +popular `Subversion`_ revision control system: the first (called 'svnurl') +by interfacing with a remote server, the second by wrapping a local checkout. +Both allow you to access relatively advanced features such as metadata and +versioning, and both in a way more user-friendly manner than existing other +solutions. + +Some example usage of :api:`py.path.svnurl`:: + + >>> url = py.path.svnurl('http://codespeak.net/svn/py') + >>> info = url.info() + >>> info.kind + 'dir' + >>> firstentry = url.log()[-1] + >>> import time + >>> time.strftime('%Y-%m-%d', time.gmtime(firstentry.date)) + '2004-10-02' + +Example usage of :api:`py.path.svnwc`:: + + >>> temp = py.test.ensuretemp('py.path_documentation') + >>> wc = py.path.svnwc(temp.join('svnwc')) + >>> wc.checkout('http://codespeak.net/svn/py/dist/py/path/local') + >>> wc.join('local.py').check() + True + +.. _`Subversion`: http://subversion.tigris.org/ + +:api:`py.path.extpy`/gateway? +----------------------------- + +XXX do we want any of this? + +Common vs. specific API +======================= + +If required, backend-specific extensions are allowed, but the common API is +already quite rich and should be enough for most of the use cases. This +common set includes functions such as 'path.read()' to read data from a node, +'path.write()' to write data, 'path.listdir()' to get a list of a node's +children, 'path.check()' to examine if a node exists, 'path.join()' to get +to a (grand)child, 'path.visit()' to recursively walk through a node's +children, etc. Only things that are not common on filesystems, such as handling +metadata, will require extensions. + +Extending the path interface +---------------------------- + +XXX do we want to go here at all?!? :| + +Future plans +============ + +Not sure here. + +Known problems +============== + +There are certain known problems, mostly related to cleanups and consistency +issues: + + * XXX find known issues + +We hope to have these solved as good as possible in the 1.0 release of the +py lib. + From hpk at codespeak.net Tue Jan 30 23:22:17 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 30 Jan 2007 23:22:17 +0100 (CET) Subject: [py-svn] r37641 - in py/trunk/py: . doc misc/testing path path/extpy path/testing Message-ID: <20070130222217.5AADE1009D@code0.codespeak.net> Author: hpk Date: Tue Jan 30 23:22:15 2007 New Revision: 37641 Removed: py/trunk/py/path/extpy/ Modified: py/trunk/py/__init__.py py/trunk/py/doc/TODO.txt py/trunk/py/doc/path.txt py/trunk/py/misc/testing/test_api.py py/trunk/py/path/common.py py/trunk/py/path/testing/common.py py/trunk/py/path/testing/test_api.py Log: removing py.path.extpy after all Modified: py/trunk/py/__init__.py ============================================================================== --- py/trunk/py/__init__.py (original) +++ py/trunk/py/__init__.py Tue Jan 30 23:22:15 2007 @@ -61,7 +61,6 @@ 'path.svnwc' : ('./path/svn/wccommand.py', 'SvnWCCommandPath'), 'path.svnurl' : ('./path/svn/urlcommand.py', 'SvnCommandPath'), 'path.local' : ('./path/local/local.py', 'LocalPath'), - 'path.extpy' : ('./path/extpy/extpy.py', 'Extpy'), # some nice slightly magic APIs 'magic.greenlet' : ('./magic/greenlet.py', 'greenlet'), Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Tue Jan 30 23:22:15 2007 @@ -32,9 +32,9 @@ * remove from public namespace: XXX consider py.magic. invoke/revoke/patch/revert + (DONE) remove py.path.extpy * make "_" namespace: - py.path.extpy -> py.path._extpy py.log -> py._log (pypy!) * review py.io and write py.io.dupfile docstring @@ -97,7 +97,7 @@ (guido tested all on win32, everything works except --dist (requires os.fork to work)) -* see why startcapture() does not use FD-based +* see why startcapture() used to not use FD-based "py.io.OutErrCapture" to isolate standard output. use that check if all py and PyPy tests pass as good as they do without. @@ -118,7 +118,6 @@ ------------------------------------ * (DONE, except apigen) cleanup initialisation of config / get rid of pkgdir -* unify option names (dist_*) * (optional) see if more of py/test/session.py's Session can be reused * (DONE, but slightly different way) have dist_rsyncroots be relative to the conftest.py file @@ -291,25 +290,6 @@ path.local.__cmp__ misses a docstring path.local.__add__ misses a docstring path.local.Checkers misses a docstring - path.extpy.visit misses a docstring - path.extpy.samefile misses a docstring - path.extpy.relto misses a docstring - path.extpy.listobj misses a docstring - path.extpy.listdir misses a docstring - path.extpy.join misses a docstring - path.extpy.getpymodule misses a docstring - path.extpy.getfilelineno misses a docstring - path.extpy.dirpath misses a docstring - path.extpy.check misses a docstring - path.extpy.__str__ misses a docstring - path.extpy.__repr__ misses a docstring - path.extpy.__new__ misses a docstring - path.extpy.__iter__ misses a docstring - path.extpy.__hash__ misses a docstring - path.extpy.__contains__ misses a docstring - path.extpy.__cmp__ misses a docstring - path.extpy.__add__ misses a docstring - path.extpy.Checkers misses a docstring test.rest.RestReporter misses a docstring test.rest.RestReporter.summary misses a docstring test.rest.RestReporter.skips misses a docstring Modified: py/trunk/py/doc/path.txt ============================================================================== --- py/trunk/py/doc/path.txt (original) +++ py/trunk/py/doc/path.txt Tue Jan 30 23:22:15 2007 @@ -69,10 +69,6 @@ .. _`Subversion`: http://subversion.tigris.org/ -:api:`py.path.extpy`/gateway? ------------------------------ - -XXX do we want any of this? Common vs. specific API ======================= Modified: py/trunk/py/misc/testing/test_api.py ============================================================================== --- py/trunk/py/misc/testing/test_api.py (original) +++ py/trunk/py/misc/testing/test_api.py Tue Jan 30 23:22:15 2007 @@ -10,7 +10,6 @@ assert_class('py.path', 'local') assert_class('py.path', 'svnwc') assert_class('py.path', 'svnurl') - assert_class('py.path', 'extpy') def test_magic_entrypoints(self): assert_function('py.magic', 'invoke') Modified: py/trunk/py/path/common.py ============================================================================== --- py/trunk/py/path/common.py (original) +++ py/trunk/py/path/common.py Tue Jan 30 23:22:15 2007 @@ -7,7 +7,7 @@ import py def checktype(pathinstance, kw): - names = ('local', 'svnwc', 'svnurl', 'py', 'extpy') + names = ('local', 'svnwc', 'svnurl', 'py', ) for name,value in kw.items(): if name in names: cls = getattr(py.path, name) Modified: py/trunk/py/path/testing/common.py ============================================================================== --- py/trunk/py/path/testing/common.py (original) +++ py/trunk/py/path/testing/common.py Tue Jan 30 23:22:15 2007 @@ -54,10 +54,6 @@ x = other.common(self.root) assert x == self.root - third = py.path.extpy('x', 'whatever') - x = other.common(third) - assert x is None - #def test_parents_nonexisting_file(self): # newpath = self.root / 'dirnoexist' / 'nonexisting file' Modified: py/trunk/py/path/testing/test_api.py ============================================================================== --- py/trunk/py/path/testing/test_api.py (original) +++ py/trunk/py/path/testing/test_api.py Tue Jan 30 23:22:15 2007 @@ -9,7 +9,7 @@ def repr_eval_test(self, p): r = repr(p) - from py.path import local,svnurl, svnwc, extpy + from py.path import local,svnurl, svnwc y = eval(r) assert y == p @@ -21,7 +21,6 @@ assert p.check() assert p.check(local=1) assert p.check(svnwc=0) - assert p.check(extpy=0) assert not p.check(svnwc=1) self.repr_eval_test(p) From arigo at codespeak.net Wed Jan 31 00:07:50 2007 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 31 Jan 2007 00:07:50 +0100 (CET) Subject: [py-svn] r37642 - py/trunk/py/c-extension/greenlet Message-ID: <20070130230750.3AF98100A3@code0.codespeak.net> Author: arigo Date: Wed Jan 31 00:07:48 2007 New Revision: 37642 Modified: py/trunk/py/c-extension/greenlet/greenlet.c py/trunk/py/c-extension/greenlet/test_greenlet.py Log: issue40 resolved Thanks ghazel. I fixed this by directly capturing ts_current in a local variable instead of reloading it. I also reviewed the code a bit and found another place where ts_current could be used out of date. Modified: py/trunk/py/c-extension/greenlet/greenlet.c ============================================================================== --- py/trunk/py/c-extension/greenlet/greenlet.c (original) +++ py/trunk/py/c-extension/greenlet/greenlet.c Wed Jan 31 00:07:48 2007 @@ -394,7 +394,8 @@ /* in the new greenlet */ PyObject* args; PyObject* result; - ts_current->stack_start = (char*) 1; /* running */ + PyGreenlet* ts_self = ts_current; + ts_self->stack_start = (char*) 1; /* running */ args = ts_passaround; if (args == NULL) /* pending exception */ @@ -407,8 +408,8 @@ Py_DECREF(run); result = g_handle_exit(result); /* jump back to parent */ - ts_current->stack_start = NULL; /* dead */ - g_switch(ts_current->parent, result); + ts_self->stack_start = NULL; /* dead */ + g_switch(ts_self->parent, result); /* must not return from here! */ Py_FatalError("XXX memory exhausted at a very bad moment"); } @@ -463,6 +464,8 @@ because the 'parent' field chain would hold a reference */ PyObject* result; + if (!STATE_OK) + return -1; Py_INCREF(ts_current); self->parent = ts_current; /* Send the greenlet a GreenletExit exception. */ Modified: py/trunk/py/c-extension/greenlet/test_greenlet.py ============================================================================== --- py/trunk/py/c-extension/greenlet/test_greenlet.py (original) +++ py/trunk/py/c-extension/greenlet/test_greenlet.py Wed Jan 31 00:07:48 2007 @@ -142,3 +142,17 @@ assert not g assert next == "meaning of life" assert g.gr_frame is None + +def test_thread_bug(): + if not thread: + py.test.skip("this is a test about thread") + import time + def runner(x): + g = greenlet(lambda: time.sleep(x)) + g.switch() + t1 = threading.Thread(target=runner, args=(0.2,)) + t2 = threading.Thread(target=runner, args=(0.3,)) + t1.start() + t2.start() + t1.join() + t2.join() From hpk at codespeak.net Wed Jan 31 00:13:50 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 00:13:50 +0100 (CET) Subject: [py-svn] r37643 - py/trunk/py/doc Message-ID: <20070130231350.6FCA1100A3@code0.codespeak.net> Author: hpk Date: Wed Jan 31 00:13:49 2007 New Revision: 37643 Modified: py/trunk/py/doc/execnet.txt Log: stroke the historical notes, and streamlined various parts of execnet documentation, added some api references. Modified: py/trunk/py/doc/execnet.txt ============================================================================== --- py/trunk/py/doc/execnet.txt (original) +++ py/trunk/py/doc/execnet.txt Wed Jan 31 00:13:49 2007 @@ -4,7 +4,7 @@ .. contents:: .. sectnum:: -Execnet deals with letting your python programs execute and +``py.execnet`` deals with letting your python programs execute and communicate across process and computer barriers. At the core it is a very simple and powerful mechanism: executing source code at "the other side" and communicating with @@ -15,35 +15,18 @@ there yet. You may refer to the `py API`_ reference for further information. -The "shpy" way, historical remarks ----------------------------------- - -Some of you may have seen the pygame-based editor **shpy** -that Armin Rigo, Holger Krekel and Michael Hudson demonstrated -at EuroPython 2004 during the lightning talks. It is a -multiline interactive python environment which allows multiple -remote users to have their own cursors and shared interaction -with the graphical shell which can execute python code, of -course. - -**py.execnet** extracts and refines the basic mechanism that -was originally developed from the one-week hack that is the -current **shpy**. No, the latter is not released but hopefully -Armin, Holger and others get to do a second one-week sprint at -some point to be able to release it. If you are interested -drop them a note. This is real fun if you are willing to -bend your mind a bit. A new view on distributed execution ----------------------------------- -**py.execnet** takes the view of **asynchronously executing -client-provided code fragments** to help address a core -problem of distributed programs. A core feature of -**py.execnet** is that **the communication protocols can be -defined by the client side**. Usually, with server/client -apps and especially RMI systems you often have to upgrade your -server if you upgrade your client. +**py.execnet** lets you asynchronously execute source code on +remote places. The sending and receiving side communicate via +Channels that transport marshallable objects. A core feature +of **py.execnet** is that **the communication protocols can be +completely defined by the client side**. Usually, with +server/client apps and especially Remote Method Based (RMI) +approaches you have to define interfaces and have to +upgrade your server and client and restart both. What about Security? Are you completely nuts? --------------------------------------------- @@ -68,24 +51,29 @@ High Level Interface: **remote_exec** ------------------------------------- -These gateways offer one main high level interface:: +All gateways offer one main high level interface, +e.g. def remote_exec(source): """return channel object for communicating with the asynchronously executing 'source' code which will have a corresponding 'channel' object in its executing namespace.""" - -The most important property of execnet gateways is that the -protocol they speak with each other ``is determined by the -client side``. If you open a gateway on some server in order -to coordinate with some other programs you determine your -communication protocol. Multiple clients can run their own -gateway versions in the same remote process (e.g. connecting -through their version of a SocketGateway). + +With `remote_exec` you send source code to the other +side and get both a local and a remote Channel_ object, +which you can use to have the local and remote site +communicate data in a structured way. + +This approach implements the idea to ``determining +protocol and remote code from the client/local side``. +This makes distributing a program run in an ad-hoc +manner (using e.g. :api:`py.path.SshGateway`) very easy. You should not need to maintain software on the other sides -you are running your code at. +you are running your code at, other than the Python +executable itself. +.. _`Channel`: .. _`channel-api`: .. _`exchange data`: @@ -128,7 +116,8 @@ A remote side blocking on receive() on this channel will get woken up and see an EOFError exception. -A simple and useful Example for Channels + +The complete Fileserver example ........................................ problem: retrieving contents of remote files:: @@ -155,6 +144,7 @@ # later you can exit / close down the gateway contentgateway.exit() + A more complicated "nested" Gateway Example ........................................... From cfbolz at codespeak.net Wed Jan 31 00:20:51 2007 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 31 Jan 2007 00:20:51 +0100 (CET) Subject: [py-svn] r37644 - py/trunk/py/doc Message-ID: <20070130232051.1B424100B7@code0.codespeak.net> Author: cfbolz Date: Wed Jan 31 00:20:50 2007 New Revision: 37644 Modified: py/trunk/py/doc/execnet.txt Log: typo Modified: py/trunk/py/doc/execnet.txt ============================================================================== --- py/trunk/py/doc/execnet.txt (original) +++ py/trunk/py/doc/execnet.txt Wed Jan 31 00:20:50 2007 @@ -67,7 +67,7 @@ This approach implements the idea to ``determining protocol and remote code from the client/local side``. This makes distributing a program run in an ad-hoc -manner (using e.g. :api:`py.path.SshGateway`) very easy. +manner (using e.g. :api:`py.execnet.SshGateway`) very easy. You should not need to maintain software on the other sides you are running your code at, other than the Python From hpk at codespeak.net Wed Jan 31 00:24:00 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 00:24:00 +0100 (CET) Subject: [py-svn] r37645 - py/trunk/py/doc Message-ID: <20070130232400.7EF06100BF@code0.codespeak.net> Author: hpk Date: Wed Jan 31 00:23:59 2007 New Revision: 37645 Modified: py/trunk/py/doc/execnet.txt Log: adding an example for execnet (passes doctest) Modified: py/trunk/py/doc/execnet.txt ============================================================================== --- py/trunk/py/doc/execnet.txt (original) +++ py/trunk/py/doc/execnet.txt Wed Jan 31 00:23:59 2007 @@ -48,11 +48,30 @@ doesn't run in a kernel-level jail [#]_ in which case even that is virtualized. -High Level Interface: **remote_exec** + +Available Gateways/Connection methods +----------------------------------------- + +You may use one of the following connection methods: + +* :api:`py.execnet.PopenGateway` a subprocess on the local + machine. Useful for jailing certain parts of a program + or for making use of multiple processors. + +* :api:`py.execnet.SshGateway` a way to connect to + a remote ssh server and distribute execution to it. + +* :api:`py.execnet.SocketGateway` a way to connect to + a remote Socket based server. *Note* that this method + requires a manually started + :source:py/execnet/script/socketserver.py + script. You can run this "server script" without + having the py lib installed on that remote system. + +Remote execution approach ------------------------------------- -All gateways offer one main high level interface, -e.g. +All gateways offer one main high level function: def remote_exec(source): """return channel object for communicating with the asynchronously @@ -62,9 +81,17 @@ With `remote_exec` you send source code to the other side and get both a local and a remote Channel_ object, which you can use to have the local and remote site -communicate data in a structured way. +communicate data in a structured way. Here is +an example: + + >>> import py + >>> gw = py.execnet.PopenGateway(python="python2.3") + >>> channel = gw.remote_exec("import sys ; channel.send(sys.version_info)") + >>> channel.receive()[:2] + (2, 3) + >>> gw.exit() -This approach implements the idea to ``determining +`remote_exec` implements the idea to ``determine protocol and remote code from the client/local side``. This makes distributing a program run in an ad-hoc manner (using e.g. :api:`py.execnet.SshGateway`) very easy. From arigo at codespeak.net Wed Jan 31 00:29:46 2007 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 31 Jan 2007 00:29:46 +0100 (CET) Subject: [py-svn] r37646 - py/trunk/py/doc Message-ID: <20070130232946.0D0F1100B7@code0.codespeak.net> Author: arigo Date: Wed Jan 31 00:29:45 2007 New Revision: 37646 Modified: py/trunk/py/doc/greenlet.txt Log: Wording, and missing attribute in the greenlet documentation. Modified: py/trunk/py/doc/greenlet.txt ============================================================================== --- py/trunk/py/doc/greenlet.txt (original) +++ py/trunk/py/doc/greenlet.txt Wed Jan 31 00:29:45 2007 @@ -229,7 +229,7 @@ sent to its parent. If ``run()`` terminates with an exception, the exception is propagated to its parent (unless it is a ``greenlet.GreenletExit`` exception, in which case the exception - object itself is sent to the parent). + object is caught and *returned* to the parent). Apart from the cases described above, the target greenlet normally receives the object as the return value of the call to ``switch()`` in @@ -263,6 +263,9 @@ ``g.gr_frame`` The current top frame, or None. +``g.dead`` + True if ``g`` is dead (i.e. it finished its execution). + ``bool(g)`` True if ``g`` is active, False if it is dead or not yet started. From hpk at codespeak.net Wed Jan 31 00:46:21 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 00:46:21 +0100 (CET) Subject: [py-svn] r37647 - py/trunk/py/doc Message-ID: <20070130234621.B5D30100BE@code0.codespeak.net> Author: hpk Date: Wed Jan 31 00:46:20 2007 New Revision: 37647 Modified: py/trunk/py/doc/execnet.txt Log: make the example independent from the installed python binaries Modified: py/trunk/py/doc/execnet.txt ============================================================================== --- py/trunk/py/doc/execnet.txt (original) +++ py/trunk/py/doc/execnet.txt Wed Jan 31 00:46:20 2007 @@ -85,11 +85,14 @@ an example: >>> import py - >>> gw = py.execnet.PopenGateway(python="python2.3") - >>> channel = gw.remote_exec("import sys ; channel.send(sys.version_info)") - >>> channel.receive()[:2] - (2, 3) - >>> gw.exit() + >>> gw = py.execnet.PopenGateway() + >>> channel = gw.remote_exec(""" + ... import os + ... channel.send(os.getpid()) + ... """) + >>> remote_pid = channel.receive() + >>> remote_pid != py.std.os.getpid() + True `remote_exec` implements the idea to ``determine protocol and remote code from the client/local side``. From hpk at codespeak.net Wed Jan 31 12:27:27 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 12:27:27 +0100 (CET) Subject: [py-svn] r37661 - py/trunk/py/bin Message-ID: <20070131112727.0ABBE100AD@code0.codespeak.net> Author: hpk Date: Wed Jan 31 12:27:25 2007 New Revision: 37661 Modified: py/trunk/py/bin/py.cleanup Log: fixing this script (IMO it was broken if you provided arguments) Modified: py/trunk/py/bin/py.cleanup ============================================================================== --- py/trunk/py/bin/py.cleanup (original) +++ py/trunk/py/bin/py.cleanup Wed Jan 31 12:27:25 2007 @@ -9,17 +9,16 @@ """ from _findpy import py import py -from py.compat import optparse -parser = optparse.OptionParser(usage=__doc__) +parser = py.compat.optparse.OptionParser(usage=__doc__) if __name__ == '__main__': (options, args) = parser.parse_args() - if len(args) >= 1: - path = py.path.local(args) - else: - path = py.path.local() - print "cleaning path", path - for x in path.visit('*.pyc', lambda x: x.check(dotfile=0, link=0)): - x.remove() + if not args: + args = ["."] + for arg in args: + path = py.path.local(arg) + print "cleaning path", path + for x in path.visit('*.pyc', lambda x: x.check(dotfile=0, link=0)): + x.remove() From hpk at codespeak.net Wed Jan 31 12:49:26 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 12:49:26 +0100 (CET) Subject: [py-svn] r37664 - py/trunk/py/doc Message-ID: <20070131114926.62B281008D@code0.codespeak.net> Author: hpk Date: Wed Jan 31 12:49:25 2007 New Revision: 37664 Modified: py/trunk/py/doc/path.txt Log: some streamlining, additions and "de-marketing" :) and adding some XXX Modified: py/trunk/py/doc/path.txt ============================================================================== --- py/trunk/py/doc/path.txt (original) +++ py/trunk/py/doc/path.txt Wed Jan 31 12:49:25 2007 @@ -5,13 +5,10 @@ .. contents:: .. sectnum:: -The 'py' lib provides an elegant, high-level api to deal with filesystems -and filesystem-like interfaces: :api:`py.path`. Here a simple but powerful -interface to deal with object trees (reading from and writing to nodes, adding -nodes and examining the structure, etc.) in a filesystem-oriented way is -defined, along with a number of readily available implementations. - -source: :source:`py/path/` +The 'py' lib provides a uniform high-level api to deal with filesystems +and filesystem-like interfaces: :api:`py.path`. It aims to offer a central +object to fs-like object trees (reading from and writing to files, adding +files/directories, examining the types and structure, etc.). Path implementations provided by :api:`py.path` =============================================== @@ -69,37 +66,84 @@ .. _`Subversion`: http://subversion.tigris.org/ - Common vs. specific API ======================= -If required, backend-specific extensions are allowed, but the common API is -already quite rich and should be enough for most of the use cases. This -common set includes functions such as 'path.read()' to read data from a node, -'path.write()' to write data, 'path.listdir()' to get a list of a node's -children, 'path.check()' to examine if a node exists, 'path.join()' to get -to a (grand)child, 'path.visit()' to recursively walk through a node's -children, etc. Only things that are not common on filesystems, such as handling -metadata, will require extensions. +All Path objects support a common set of operations, suitable +for many use cases and allowing to transparently switch the +path object within an application (e.g. from "local" to "svnwc"). +The common set includes functions such as `path.read()` to read all data +from a file, `path.write()` to write data, `path.listdir()` to get a list +of directory entries, and `path.check()` to check if a node exists +and is of a particular type, `path.join()` to get +to a (grand)child, `path.visit()` to recursively walk through a node's +children, etc. Only things that are not common on all filesystems, such +as handling metadata (e.g. the subversion "properties") require +using specific APIs. -Extending the path interface ----------------------------- +Examples +--------------------------------- -XXX do we want to go here at all?!? :| +Searching `.txt` files ++++++++++++++++++++++++++++++++++++++ -Future plans -============ +XXX example + + +Joining and checking path types ++++++++++++++++++++++++++++++++++++++ + +XXX example + +setting svn-properties ++++++++++++++++++++++++++++++++++++++++ -Not sure here. +XXX example -Known problems -============== -There are certain known problems, mostly related to cleanups and consistency -issues: +XXX more examples (look at API) ++++++++++++++++++++++++++++++++++++++++ + +XXX + +Known problems / limitations +=================================== + +There are some known issues, most importantly +that using the Subversion Paths requires the +command line `svn` binary and parsing its output +is a bit fragile across versions and locales +(it basically only works with an english locale!). + +XXX note more here + + +Future plans +============ - * XXX find known issues +The Subversion path implementations are based +on the `svn` command line, not on the bindings. +It makes sense now to directly use the bindings. + +Moreover, it would be good, also considering +`py.execnet`_ distribution of programs, to +be able to manipulate Windows Paths on Linux +and vice versa. So we'd like to consider +refactoring the path implementations +to provide this choice (and getting rid +of platform-dependencies as much as possible). + +There are various hacks out there to have +Memory-Filesystems and even path objects +being directly mountable under Linux (via `fuse`). +However, the Path object implementations +do not internally have a clean abstraction +of going to the filesystem - so with some +refactoring it should become easier to +have very custom Path objects, still offering +the quite full interface without requiring +to know about all details of the full path +implementation. -We hope to have these solved as good as possible in the 1.0 release of the -py lib. +.. _`py.execnet`: execnet.html From guido at codespeak.net Wed Jan 31 16:29:21 2007 From: guido at codespeak.net (guido at codespeak.net) Date: Wed, 31 Jan 2007 16:29:21 +0100 (CET) Subject: [py-svn] r37674 - in py/trunk/py: code doc Message-ID: <20070131152921.9575B10087@code0.codespeak.net> Author: guido Date: Wed Jan 31 16:29:18 2007 New Revision: 37674 Added: py/trunk/py/doc/code.txt Modified: py/trunk/py/code/code.py py/trunk/py/code/excinfo.py py/trunk/py/code/frame.py py/trunk/py/code/traceback2.py Log: Added document 'code.txt' that describes py.code, added docstrings to py.code public items. Modified: py/trunk/py/code/code.py ============================================================================== --- py/trunk/py/code/code.py (original) +++ py/trunk/py/code/code.py Wed Jan 31 16:29:18 2007 @@ -1,6 +1,7 @@ import py class Code(object): + """ wrapper around Python code objects """ def __init__(self, rawcode): rawcode = getattr(rawcode, 'im_func', rawcode) rawcode = getattr(rawcode, 'func_code', rawcode) @@ -57,6 +58,7 @@ ) def path(self): + """ return a py.path.local object wrapping the source of the code """ try: return self.raw.co_filename.__path__ except AttributeError: @@ -64,6 +66,8 @@ path = property(path, None, None, "path of this code object") def fullsource(self): + """ return a py.code.Source object for the full source file of the code + """ fn = self.raw.co_filename try: return fn.__source__ @@ -73,11 +77,16 @@ "full source containing this code object") def source(self): + """ return a py.code.Source object for the code object's source only + """ # return source only for that part of code import inspect return py.code.Source(inspect.getsource(self.raw)) def getargs(self): + """ return a tuple with the argument names for the code object + """ # handfull shortcut for getting args raw = self.raw return raw.co_varnames[:raw.co_argcount] + Modified: py/trunk/py/code/excinfo.py ============================================================================== --- py/trunk/py/code/excinfo.py (original) +++ py/trunk/py/code/excinfo.py Wed Jan 31 16:29:18 2007 @@ -22,6 +22,13 @@ self.traceback = py.code.Traceback(tb) def exconly(self, tryshort=False): + """ return the exception as a string + + when 'tryshort' resolves to True, and the exception is a + py.magic.AssertionError, only the actual exception part of + the exception representation is returned (so 'AssertionError: ' is + removed from the beginning) + """ lines = py.std.traceback.format_exception_only(self.type, self.value) text = ''.join(lines) if text.endswith('\n'): @@ -32,6 +39,7 @@ return text def errisinstance(self, exc): + """ return True if the exception is an instance of exc """ return isinstance(self.value, exc) def __str__(self): Modified: py/trunk/py/code/frame.py ============================================================================== --- py/trunk/py/code/frame.py (original) +++ py/trunk/py/code/frame.py Wed Jan 31 16:29:18 2007 @@ -18,23 +18,38 @@ "statement this frame is at") def eval(self, code, **vars): + """ evaluate 'code' in the frame + + 'vars' are optional additional local variables + + returns the result of the evaluation + """ f_locals = self.f_locals.copy() f_locals.update(vars) return eval(code, self.f_globals, f_locals) def exec_(self, code, **vars): + """ exec 'code' in the frame + + 'vars' are optiona; additional local variables + """ f_locals = self.f_locals.copy() f_locals.update(vars) exec code in self.f_globals, f_locals def repr(self, object): + """ return a 'safe' (non-recursive, one-line) string repr for 'object' + """ return py.__.code.safe_repr._repr(object) def is_true(self, object): return object def getargs(self): + """ return a list of tuples (name, value) for all arguments + """ retval = [] for arg in self.code.getargs(): retval.append((arg, self.f_locals[arg])) return retval + Modified: py/trunk/py/code/traceback2.py ============================================================================== --- py/trunk/py/code/traceback2.py (original) +++ py/trunk/py/code/traceback2.py Wed Jan 31 16:29:18 2007 @@ -2,6 +2,8 @@ import py class TracebackEntry(object): + """ a single entry in a traceback """ + exprinfo = None def __init__(self, rawentry): @@ -14,6 +16,7 @@ return "" %(self.frame.code.path, self.lineno+1) def statement(self): + """ return a py.code.Source object for the current statement """ source = self.frame.code.fullsource return source.getstatement(self.lineno) statement = property(statement, None, None, @@ -63,6 +66,11 @@ source = property(getsource) def ishidden(self): + """ return True if the current frame has a var __tracebackhide__ + resolving to True + + mostly for internal use + """ try: return self.frame.eval("__tracebackhide__") except (SystemExit, KeyboardInterrupt): @@ -103,6 +111,15 @@ list.__init__(self, tb) def cut(self, path=None, lineno=None, firstlineno=None): + """ return a Traceback instance wrapping part of this Traceback + + by provding any combination of path, lineno and firstlineno, the + first frame to start the to-be-returned traceback is determined + + this allows cutting the first part of a Traceback instance e.g. + for formatting reasons (removing some uninteresting bits that deal + with handling of the exception/traceback) + """ for x in self: if ((path is None or x.frame.code.path == path) and (lineno is None or x.lineno == lineno) and @@ -114,9 +131,18 @@ val = super(Traceback, self).__getitem__(key) if isinstance(key, type(slice(0))): val = self.__class__(val) - return val + return val def filter(self, fn=lambda x: not x.ishidden()): + """ return a Traceback instance with certain items removed + + fn is a function that gets a single argument, a TracebackItem + instance, and should return True when the item should be added + to the Traceback, False when not + + by default this removes all the TracebackItems which are hidden + (see ishidden() above) + """ return Traceback(filter(fn, self)) def getcrashentry(self): @@ -129,6 +155,9 @@ return tb[-1] def recursionindex(self): + """ return the index of the frame/TracebackItem where recursion + originates if appropriate, None if no recursion occurred + """ cache = {} for i, entry in py.builtin.enumerate(self): key = entry.frame.code.path, entry.lineno @@ -155,3 +184,4 @@ co_equal = compile('__recursioncache_locals_1 == __recursioncache_locals_2', '?', 'eval') + Added: py/trunk/py/doc/code.txt ============================================================================== --- (empty file) +++ py/trunk/py/doc/code.txt Wed Jan 31 16:29:18 2007 @@ -0,0 +1,141 @@ +============== +:api:`py.code` +============== + +The :api:`py.code` part of the 'py lib' contains some functionality to help +dealing with Python code objects. Even though working with Python's internal +code objects (as found on frames and callables) can be very powerful, it's +usually also quite cumbersome, because the API provided by core Python is +relatively low level and not very accessible. + +The :api:`py.code` library tries to simplify accessing the code objects as well +as creating them. There is a small set of interfaces a user needs to deal with, +all nicely bundled together, and with a rich set of 'Pythonic' functionality. + +source: :source:`py/code/` + +Contents of the library +======================= + +Every object in the :api:`py.code` library wraps a code Python object related +to code objects, source code, frames and tracebacks: the :api:`py.code.Code` +class wraps code objects, :api:`py.code.Source` source snippets, +:api:`py.code.Traceback` exception tracebacks, :api:`py.code.Frame` frame +objects (as found in e.g. tracebacks) and :api:`py.code.ExceptionInfo` the +tuple provided by sys.exc_info() (containing exception and traceback +information when an exception occurs). Also in the library is a helper function +:api:`py.code.compile()` that provides the same functionality as Python's +built-in 'compile()' function, but returns a wrapped code object. + +The wrappers +============ + +:api:`py.code.Code` +------------------- + +Code objects are instantiated with a code object or a callable as argument, +and provide functionality to compare themselves with other Code objects, get to +the source file or its contents, create new Code objects from scratch, etc. + +A quick example:: + + >>> import py + >>> c = py.code.Code(py.path.local.read) + >>> c.path.basename + 'common.py' + >>> isinstance(c.source(), py.code.Source) + True + >>> str(c.source()).split('\n')[0] + "def read(self, mode='rb'):" + +source: :source:`py/code/code.py` + +:api:`py.code.Source` +--------------------- + +Source objects wrap snippets of Python source code, providing a simple yet +powerful interface to read, deindent, slice, compare, compile and manipulate +them, things that are not so easy in core Python. + +Example:: + + >>> s = py.code.Source("""\ + ... def foo(): + ... print "foo" + ... """) + >>> str(s).startswith('def') # automatic de-indentation! + True + >>> s.isparseable() + True + >>> sub = s.getstatement(1) # get the statement starting at line 1 + >>> str(sub).strip() # XXX why is the strip() required?!? + 'print "foo"' + +source: :source:`py/code/source.py` + +:api:`py.code.Traceback` +------------------------ + +Tracebacks are usually not very easy to examine, you need to access certain +somewhat hidden attributes of the traceback's items (resulting in expressions +such as 'fname = tb.tb_next.tb_frame.f_code.co_filename'). The Traceback +interface (and its TracebackItem children) tries to improve this. + +Example:: + + >>> import sys + >>> try: + ... py.path.local(100) # illegal argument + ... except: + ... exc, e, tb = sys.exc_info() + >>> t = py.code.Traceback(tb) + >>> first = t[1] # get the second entry (first is in this doc) + >>> first.path.basename # second is in py/path/local.py + 'local.py' + >>> isinstance(first.statement, py.code.Source) + True + >>> str(first.statement).strip().startswith('raise ValueError') + True + +source: :source:`py/code/traceback2.py` + +:api:`py.code.Frame` +-------------------- + +Frame wrappers are used in :api:`py.code.Traceback` items, and will usually not +directly be instantiated. They provide some nice methods to evaluate code +'inside' the frame (using the frame's local variables), get to the underlying +code (frames have a code attribute that points to a :api:`py.code.Code` object) +and examine the arguments. + +Example (using the 'first' TracebackItem instance created above):: + + >>> frame = first.frame + >>> isinstance(frame.code, py.code.Code) + True + >>> isinstance(frame.eval('self'), py.__.path.local.local.LocalPath) + True + >>> [namevalue[0] for namevalue in frame.getargs()] + ['cls', 'path'] + +:api:`py.code.ExceptionInfo` +---------------------------- + +A wrapper around the tuple returned by sys.exc_info() (will call sys.exc_info() +itself if the tuple is not provided as an argument), provides some handy +attributes to easily access the traceback and exception string. + +Example:: + + >>> import sys + >>> try: + ... foobar() + ... except: + ... excinfo = py.code.ExceptionInfo() + >>> excinfo.typename + 'exceptions.NameError' + >>> isinstance(excinfo.traceback, py.code.Traceback) + True + >>> excinfo.exconly() + "NameError: name 'foobar' is not defined" + From hpk at codespeak.net Wed Jan 31 21:34:31 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 21:34:31 +0100 (CET) Subject: [py-svn] r37693 - py/trunk/py/path/gateway Message-ID: <20070131203431.8650210082@code0.codespeak.net> Author: hpk Date: Wed Jan 31 21:34:29 2007 New Revision: 37693 Added: py/trunk/py/path/gateway/TODO.txt (contents, props changed) py/trunk/py/path/gateway/__init__.py (contents, props changed) Log: Some considerations regarding the experimental Gateway/Remote Path implementation code. Also making it "py.__." importable but not advertising it for 0.9 at all. It's an interesting feature for 1.0 :) Added: py/trunk/py/path/gateway/TODO.txt ============================================================================== --- (empty file) +++ py/trunk/py/path/gateway/TODO.txt Wed Jan 31 21:34:29 2007 @@ -0,0 +1,24 @@ +I think the nice code in this directory +should be refactored so that you can use +it like this: + + rp = gateway.get_remote_path(relpath) + +and relpath could be absolute, relative (should +follow remote-platform syntax) or None/"." (the +current dir on the other side). + +The tricky part probably is defining sensible +setup/teardown semantics with respect to +starting the "Path" server on the other side, +we at least don't want to have multiple threads +that serve path requests and maybe we want +to be able to explicitely shutdown a once +started RemotePath server (not sure though). + +For a single-threaded py.execnet it might be helpful to be +able to install new network messages (which are lower level +than remote_exec() and work with callbacks, so don't follow +the nice "synchronous" programming model that you get with +threads/greenlets/tasklets). + Added: py/trunk/py/path/gateway/__init__.py ============================================================================== --- (empty file) +++ py/trunk/py/path/gateway/__init__.py Wed Jan 31 21:34:29 2007 @@ -0,0 +1 @@ +# From hpk at codespeak.net Wed Jan 31 22:55:32 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 22:55:32 +0100 (CET) Subject: [py-svn] r37696 - in py/trunk/py: . misc/testing test test/testing Message-ID: <20070131215532.D6F3710079@code0.codespeak.net> Author: hpk Date: Wed Jan 31 22:55:30 2007 New Revision: 37696 Removed: py/trunk/py/test/compat.py py/trunk/py/test/testing/test_compat.py Modified: py/trunk/py/__init__.py py/trunk/py/misc/testing/test_initpkg.py Log: removing py.test.compat.TestCase - it's small code but nobody uses it i think and there is no documentation. Modified: py/trunk/py/__init__.py ============================================================================== --- py/trunk/py/__init__.py (original) +++ py/trunk/py/__init__.py Wed Jan 31 22:55:30 2007 @@ -29,7 +29,6 @@ 'test.skip' : ('./test/item.py', 'skip'), 'test.fail' : ('./test/item.py', 'fail'), 'test.exit' : ('./test/session.py', 'exit'), - 'test.compat.TestCase' : ('./test/compat.py', 'TestCase'), # configuration/initialization related test api 'test.config' : ('./test/config.py', 'config_per_process'), Modified: py/trunk/py/misc/testing/test_initpkg.py ============================================================================== --- py/trunk/py/misc/testing/test_initpkg.py (original) +++ py/trunk/py/misc/testing/test_initpkg.py Wed Jan 31 22:55:30 2007 @@ -49,12 +49,10 @@ def test_importall(): base = py.path.local(py.__file__).dirpath() nodirs = ( - base.join('test', 'tkinter'), base.join('test', 'testing', 'data'), base.join('apigen', 'tracer', 'testing', 'package'), base.join('test', 'testing', 'test'), base.join('magic', 'greenlet.py'), - base.join('path', 'extpy', 'testing', 'test_data'), base.join('path', 'gateway',), base.join('doc',), base.join('rest', 'directive.py'), @@ -63,7 +61,6 @@ base.join('magic', 'greenlet.py'), base.join('bin'), base.join('execnet', 'script'), - base.join('compat'), ) for p in base.visit('*.py', lambda x: x.check(dotfile=0)): if p.basename == '__init__.py': Deleted: /py/trunk/py/test/compat.py ============================================================================== --- /py/trunk/py/test/compat.py Wed Jan 31 22:55:30 2007 +++ (empty file) @@ -1,58 +0,0 @@ -from __future__ import generators -import py - -class TestCaseUnit(py.test.Function): - """ compatibility Unit executor for TestCase methods - honouring setUp and tearDown semantics. - """ - def execute(self, session): - boundmethod = self.obj - instance = boundmethod.im_self - instance.setUp() - try: - boundmethod() - finally: - instance.tearDown() - return py.test.Item.Passed() - -class TestCase: - """compatibility class of unittest's TestCase. """ - Function = TestCaseUnit - - def setUp(self): - pass - - def tearDown(self): - pass - - def fail(self, msg=None): - """ fail immediate with given message. """ - raise py.test.Item.Failed(msg=msg) - - def assertRaises(self, excclass, func, *args, **kwargs): - py.test.raises(excclass, func, *args, **kwargs) - failUnlessRaises = assertRaises - - # dynamically construct (redundant) methods - aliasmap = [ - ('x', 'not x', 'assert_, failUnless'), - ('x', 'x', 'failIf'), - ('x,y', 'x!=y', 'failUnlessEqual,assertEqual, assertEquals'), - ('x,y', 'x==y', 'failIfEqual,assertNotEqual, assertNotEquals'), - ] - items = [] - for sig, expr, names in aliasmap: - names = map(str.strip, names.split(',')) - sigsubst = expr.replace('y', '%s').replace('x', '%s') - for name in names: - items.append(""" - def %(name)s(self, %(sig)s): - __tracebackhide__ = True - if %(expr)s: - raise py.test.Item.Failed(msg=%(sigsubst)r %% (%(sig)s)) - """ % locals() ) - - source = "".join(items) - exec py.code.Source(source).compile() - -__all__ = ['TestCase'] Deleted: /py/trunk/py/test/testing/test_compat.py ============================================================================== --- /py/trunk/py/test/testing/test_compat.py Wed Jan 31 22:55:30 2007 +++ (empty file) @@ -1,51 +0,0 @@ -from __future__ import generators -import py - -class TestCompatTestCaseSetupSemantics(py.test.compat.TestCase): - globlist = [] - - def setUp(self): - self.__dict__.setdefault('l', []).append(42) - self.globlist.append(self) - - def tearDown(self): - self.l.pop() - - def test_issetup(self): - l = self.l - assert len(l) == 1 - assert l[-1] == 42 - #self.checkmultipleinstances() - - def test_issetup2(self): - l = self.l - assert len(l) == 1 - assert l[-1] == 42 - #self.checkmultipleinstances() - - #def checkmultipleinstances(self): - # for x,y in zip(self.globlist, self.globlist[1:]): - # assert x is not y - -class TestCompatAssertions(py.test.compat.TestCase): - nameparamdef = { - 'failUnlessEqual,assertEqual,assertEquals': ('1, 1', '1, 0'), - 'assertNotEquals,failIfEqual': ('0, 1', '0,0'), - 'failUnless,assert_': ('1', 'None'), - 'failIf': ('0', '1'), - } - - sourcelist = [] - for names, (paramok, paramfail) in nameparamdef.items(): - for name in names.split(','): - source = """ - def test_%(name)s(self): - self.%(name)s(%(paramok)s) - #self.%(name)s(%(paramfail)s) - - def test_%(name)s_failing(self): - self.assertRaises(py.test.Item.Failed, - self.%(name)s, %(paramfail)s) - """ % locals() - co = py.code.Source(source).compile() - exec co From hpk at codespeak.net Wed Jan 31 23:20:35 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 23:20:35 +0100 (CET) Subject: [py-svn] r37698 - py/trunk/py/test/terminal Message-ID: <20070131222035.7BEC910077@code0.codespeak.net> Author: hpk Date: Wed Jan 31 23:20:33 2007 New Revision: 37698 Modified: py/trunk/py/test/terminal/remote.py Log: waiting even a bit longer for loop-on-failing Modified: py/trunk/py/test/terminal/remote.py ============================================================================== --- py/trunk/py/test/terminal/remote.py (original) +++ py/trunk/py/test/terminal/remote.py Wed Jan 31 23:20:33 2007 @@ -76,7 +76,7 @@ while 1: if self.config.option.looponfailing and (failures or not wasfailing): while not checkpyfilechange(rootdir): - py.std.time.sleep(2.4) + py.std.time.sleep(4.4) wasfailing = len(failures) failures = self.run_remote_session(failures) if not self.config.option.looponfailing: From hpk at codespeak.net Wed Jan 31 23:23:26 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 23:23:26 +0100 (CET) Subject: [py-svn] r37699 - in py/trunk: . py py/bin Message-ID: <20070131222326.9A3CA10082@code0.codespeak.net> Author: hpk Date: Wed Jan 31 23:23:24 2007 New Revision: 37699 Modified: py/trunk/py/__init__.py py/trunk/py/bin/_makepyrelease.py py/trunk/setup.py Log: removing py._dist export (only accessed from setup.py and py/bin/_makepyrelease.py) Modified: py/trunk/py/__init__.py ============================================================================== --- py/trunk/py/__init__.py (original) +++ py/trunk/py/__init__.py Wed Jan 31 23:23:24 2007 @@ -21,8 +21,6 @@ long_description = globals()['__doc__'], exportdefs = { - '_dist.setup' : ('./misc/_dist.py', 'setup'), - # helpers for use from test functions or collectors 'test.raises' : ('./test/raises.py', 'raises'), 'test.deprecated_call' : ('./test/deprecate.py', 'deprecated_call'), Modified: py/trunk/py/bin/_makepyrelease.py ============================================================================== --- py/trunk/py/bin/_makepyrelease.py (original) +++ py/trunk/py/bin/_makepyrelease.py Wed Jan 31 23:23:24 2007 @@ -51,16 +51,17 @@ distdir = tmpdir.ensure('dist', dir=1) oldir = rootdir.chdir() try: + from py.__.misc.dist import setup trace("invoking sdist, generating into %s" % (distdir,)) - py._dist.setup(py, script_name="setup.py", - script_args=('-q', 'sdist', '--no-prune', - '-m', str(manifest), - '--formats=gztar,zip', - '-d', str(distdir))) - py._dist.setup(py, script_name="setup.py", - script_args=('-q', 'bdist_wininst', - #'-m', str(manifest), - '-d', str(distdir))) + setup(py, script_name="setup.py", + script_args=('-q', 'sdist', '--no-prune', + '-m', str(manifest), + '--formats=gztar,zip', + '-d', str(distdir))) + setup(py, script_name="setup.py", + script_args=('-q', 'bdist_wininst', + #'-m', str(manifest), + '-d', str(distdir))) finally: oldir.chdir() return distdir Modified: py/trunk/setup.py ============================================================================== --- py/trunk/setup.py (original) +++ py/trunk/setup.py Wed Jan 31 23:23:24 2007 @@ -1,2 +1,3 @@ -import py -py._dist.setup(py) +import py +from py.__.misc._dist import setup +setup(py) From hpk at codespeak.net Wed Jan 31 23:43:32 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 23:43:32 +0100 (CET) Subject: [py-svn] r37700 - py/trunk/py/doc Message-ID: <20070131224332.12ADF10077@code0.codespeak.net> Author: hpk Date: Wed Jan 31 23:43:32 2007 New Revision: 37700 Modified: py/trunk/py/doc/path.txt Log: refer to experimental gateway path code for substantiating future directions. Modified: py/trunk/py/doc/path.txt ============================================================================== --- py/trunk/py/doc/path.txt (original) +++ py/trunk/py/doc/path.txt Wed Jan 31 23:43:32 2007 @@ -133,6 +133,12 @@ to provide this choice (and getting rid of platform-dependencies as much as possible). +There is some experimental small approach +(:source:`py/path/gateway`) aiming at having +a convenient Remote Path implementation +and some considerations about future +works in the according :source:`py/path/gateway/todo.txt` + There are various hacks out there to have Memory-Filesystems and even path objects being directly mountable under Linux (via `fuse`). From hpk at codespeak.net Wed Jan 31 23:44:04 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 23:44:04 +0100 (CET) Subject: [py-svn] r37701 - py/trunk/py/doc Message-ID: <20070131224404.62D5010077@code0.codespeak.net> Author: hpk Date: Wed Jan 31 23:44:03 2007 New Revision: 37701 Modified: py/trunk/py/doc/TODO.txt Log: note on removal of compat.TestCase Modified: py/trunk/py/doc/TODO.txt ============================================================================== --- py/trunk/py/doc/TODO.txt (original) +++ py/trunk/py/doc/TODO.txt Wed Jan 31 23:44:03 2007 @@ -1,4 +1,4 @@ -Things to do before 0.9.0 +Things to do for 0.9.0 ========================= @@ -25,8 +25,7 @@ * (hpk, should be done) move not-to-be-exported Gateway() methods to _ - methods. * docstrings for all exported API -* remove: - test.compat.TestCAse +* (DONE) remove: test.compat.TestCAse * check and likely remove already deprecated API From hpk at codespeak.net Wed Jan 31 23:56:19 2007 From: hpk at codespeak.net (hpk at codespeak.net) Date: Wed, 31 Jan 2007 23:56:19 +0100 (CET) Subject: [py-svn] r37703 - py/trunk/py/doc Message-ID: <20070131225619.81F461008E@code0.codespeak.net> Author: hpk Date: Wed Jan 31 23:56:18 2007 New Revision: 37703 Modified: py/trunk/py/doc/index.txt Log: adding references to path and code documentation Modified: py/trunk/py/doc/index.txt ============================================================================== --- py/trunk/py/doc/index.txt (original) +++ py/trunk/py/doc/index.txt Wed Jan 31 23:56:18 2007 @@ -7,6 +7,10 @@ `py.magic.greenlet`_: Lightweight in-process concurrent programming (aka Stackless) +`py.path`_: Path and Filesystem access and manipulation for local and svn based trees + +`py.code`_: High-level access/manipulation of Python code and traceback objects. + `py.xml`_ a fast'n'easy way to generate xml/html documents (including CSS-styling) `py.log`_ an alpha document about the ad-hoc logging facilities @@ -29,6 +33,8 @@ .. _`py.execnet`: execnet.html .. _`py.magic.greenlet`: greenlet.html .. _`py.log`: log.html +.. _`py.path`: path.html +.. _`py.code`: code.html .. _`py.test`: test.html .. _`py lib scripts`: bin.html .. _`py.xml`: xml.html