[test] fixes to follow recent changes stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 09 Sep 2010 10:08:06 +0200
branchstable
changeset 6197 d8f0dce0b86d
parent 6196 12fdccedab5a
child 6198 f8dea560703f
[test] fixes to follow recent changes
server/test/unittest_multisources.py
test/unittest_cwctl.py
web/test/unittest_web.py
--- a/server/test/unittest_multisources.py	Thu Sep 09 10:08:05 2010 +0200
+++ b/server/test/unittest_multisources.py	Thu Sep 09 10:08:06 2010 +0200
@@ -151,7 +151,7 @@
         self.assertEquals(len(rset), 5, zip(rset.rows, rset.description))
         rset = cu.execute('Any X ORDERBY FTIRANK(X) WHERE X has_text "card"')
         self.assertEquals(len(rset), 5, zip(rset.rows, rset.description))
-        Connection_close(cnx)
+        Connection_close(cnx.cnx) # cnx is a TestCaseConnectionProxy
 
     def test_synchronization(self):
         cu = cnx2.cursor()
--- a/test/unittest_cwctl.py	Thu Sep 09 10:08:05 2010 +0200
+++ b/test/unittest_cwctl.py	Thu Sep 09 10:08:06 2010 +0200
@@ -39,7 +39,7 @@
 
     def test_list(self):
         from cubicweb.cwctl import ListCommand
-        ListCommand().run([])
+        ListCommand(None).run([])
 
 
 class CubicWebShellTC(CubicWebTC):
--- a/web/test/unittest_web.py	Thu Sep 09 10:08:05 2010 +0200
+++ b/web/test/unittest_web.py	Thu Sep 09 10:08:06 2010 +0200
@@ -26,9 +26,9 @@
         arurl = req.ajax_replace_url
         # NOTE: for the simplest use cases, we could use doctest
         self.assertEquals(arurl('foo', rql='Person P', vid='list'),
-                          """javascript: $('#foo').loadxhtml("http://testing.fr/cubicweb/json?rql=Person%20P&fname=view&vid=list", null, 'get', 'replace'); noop()""")
+                          """javascript: $('#foo').loadxhtml("http://testing.fr/cubicweb/json?rql=Person%20P&fname=view&vid=list",null,"get","replace"); noop()""")
         self.assertEquals(arurl('foo', rql='Person P', vid='oneline', name='bar', age=12),
-                          """javascript: $('#foo').loadxhtml("http://testing.fr/cubicweb/json?name=bar&age=12&rql=Person%20P&fname=view&vid=oneline", null, 'get', 'replace'); noop()""")
+                          """javascript: $('#foo').loadxhtml("http://testing.fr/cubicweb/json?name=bar&age=12&rql=Person%20P&fname=view&vid=oneline",null,"get","replace"); noop()""")
 
 
 if __name__ == '__main__':