# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1271255194 -7200
# Node ID 842a40cade9a253673d8219898bca2f132491666
# Parent  3246b1f88a180afb2c9f860593b45dfd5f726a52# Parent  8f7843afb014a52e7bb54ec9e9d3e1ed28c63b20
backport stable

diff -r 3246b1f88a18 -r 842a40cade9a devtools/__init__.py
--- a/devtools/__init__.py	Wed Apr 14 11:26:36 2010 +0200
+++ b/devtools/__init__.py	Wed Apr 14 16:26:34 2010 +0200
@@ -155,9 +155,6 @@
         sources = super(TestServerConfiguration, self).sources()
         if not sources:
             sources = DEFAULT_SOURCES
-        if sources['system']['db-driver'] == 'sqlite':
-            # we need an abspath in case tests are changing the cwd
-            sources['system']['db-name'] = abspath(sources['system']['db-name'])
         return sources
 
 
diff -r 3246b1f88a18 -r 842a40cade9a devtools/testlib.py
--- a/devtools/testlib.py	Wed Apr 14 11:26:36 2010 +0200
+++ b/devtools/testlib.py	Wed Apr 14 16:26:34 2010 +0200
@@ -497,9 +497,9 @@
     def app_publish(self, req, path='view'):
         return self.app.publish(path, req)
 
-    def ctrl_publish(self, req):
+    def ctrl_publish(self, req, ctrl='edit'):
         """call the publish method of the edit controller"""
-        ctrl = self.vreg['controllers'].select('edit', req)
+        ctrl = self.vreg['controllers'].select(ctrl, req)
         try:
             result = ctrl.publish()
             req.cnx.commit()
diff -r 3246b1f88a18 -r 842a40cade9a web/views/debug.py
--- a/web/views/debug.py	Wed Apr 14 11:26:36 2010 +0200
+++ b/web/views/debug.py	Wed Apr 14 16:26:34 2010 +0200
@@ -165,5 +165,5 @@
         self.wview('pyvaltable', pyvalue=values[:self._cw.form.get('nb', 20)])
         if garbage:
             self.w(u'<h3>%s</h3>' % _('Unreachable objects'))
-            values = sorted(xml_escape(repr(o) for o in garbage))
+            values = sorted(xml_escape(repr(o)) for o in garbage)
             self.wview('pyvallist', pyvalue=values)