--- a/web/test/unittest_session.py	Thu Sep 23 23:28:58 2010 +0200
+++ b/web/test/unittest_session.py	Wed Sep 29 16:16:32 2010 +0200
@@ -16,16 +16,24 @@
         # make is if the web session has been opened by the session manager
         sm._sessions[self.cnx.sessionid] = self.websession
         sessionid = self.websession.sessionid
-        self.assertEquals(len(sm._sessions), 1)
-        self.assertEquals(self.websession.sessionid, self.websession.cnx.sessionid)
+        self.assertEqual(len(sm._sessions), 1)
+        self.assertEqual(self.websession.sessionid, self.websession.cnx.sessionid)
         # fake the repo session is expiring
         self.repo.close(sessionid)
         try:
             # fake an incoming http query with sessionid in session cookie
             # don't use self.request() which try to call req.set_session
             req = self.requestcls(self.vreg)
+<<<<<<< /home/syt/src/fcubicweb/cubicweb/web/test/unittest_session.py
             self.assertRaises(InvalidSession, sm.get_session, req, sessionid)
             self.assertEquals(len(sm._sessions), 0)
+=======
+            websession = sm.get_session(req, sessionid)
+            self.assertEqual(len(sm._sessions), 1)
+            self.assertIs(websession, self.websession)
+            self.assertEqual(websession.sessionid, sessionid)
+            self.assertNotEquals(websession.sessionid, websession.cnx.sessionid)
+>>>>>>> /tmp/unittest_session.py~other.sGNH8u
         finally:
             # avoid error in tearDown by telling this connection is closed...
             self.cnx._closed = True