--- a/server/test/unittest_migractions.py	Tue Apr 08 17:39:39 2014 +0200
+++ b/server/test/unittest_migractions.py	Tue Apr 08 18:00:14 2014 +0200
@@ -72,7 +72,7 @@
         self.repo.vreg['etypes'].clear_caches()
 
     def test_add_attribute_bool(self):
-        self.assertFalse('yesno' in self.schema)
+        self.assertNotIn('yesno', self.schema)
         self.session.create_entity('Note')
         self.commit()
         self.mh.cmd_add_attribute('Note', 'yesno')
@@ -88,7 +88,7 @@
         self.mh.rollback()
 
     def test_add_attribute_int(self):
-        self.assertFalse('whatever' in self.schema)
+        self.assertNotIn('whatever', self.schema)
         self.session.create_entity('Note')
         self.session.commit(free_cnxset=False)
         orderdict = dict(self.mh.rqlexec('Any RTN, O WHERE X name "Note", RDEF from_entity X, '
@@ -123,10 +123,10 @@
         self.mh.rollback()
 
     def test_add_attribute_varchar(self):
-        self.assertFalse('whatever' in self.schema)
+        self.assertNotIn('whatever', self.schema)
         self.session.create_entity('Note')
         self.session.commit(free_cnxset=False)
-        self.assertFalse('shortpara' in self.schema)
+        self.assertNotIn('shortpara', self.schema)
         self.mh.cmd_add_attribute('Note', 'shortpara')
         self.assertIn('shortpara', self.schema)
         self.assertEqual(self.schema['shortpara'].subjects(), ('Note', ))
@@ -142,9 +142,9 @@
         self.mh.rollback()
 
     def test_add_datetime_with_default_value_attribute(self):
-        self.assertFalse('mydate' in self.schema)
-        self.assertFalse('oldstyledefaultdate' in self.schema)
-        self.assertFalse('newstyledefaultdate' in self.schema)
+        self.assertNotIn('mydate', self.schema)
+        self.assertNotIn('oldstyledefaultdate', self.schema)
+        self.assertNotIn('newstyledefaultdate', self.schema)
         self.mh.cmd_add_attribute('Note', 'mydate')
         self.mh.cmd_add_attribute('Note', 'oldstyledefaultdate')
         self.mh.cmd_add_attribute('Note', 'newstyledefaultdate')
@@ -191,11 +191,11 @@
         self.mh.rollback()
 
     def test_rename_attribute(self):
-        self.assertFalse('civility' in self.schema)
+        self.assertNotIn('civility', self.schema)
         eid1 = self.mh.rqlexec('INSERT Personne X: X nom "lui", X sexe "M"')[0][0]
         eid2 = self.mh.rqlexec('INSERT Personne X: X nom "l\'autre", X sexe NULL')[0][0]
         self.mh.cmd_rename_attribute('Personne', 'sexe', 'civility')
-        self.assertFalse('sexe' in self.schema)
+        self.assertNotIn('sexe', self.schema)
         self.assertIn('civility', self.schema)
         # test data has been backported
         c1 = self.mh.rqlexec('Any C WHERE X eid %s, X civility C' % eid1)[0][0]
@@ -216,8 +216,8 @@
             self.assertEqual(s1, "foo")
 
     def test_add_entity_type(self):
-        self.assertFalse('Folder2' in self.schema)
-        self.assertFalse('filed_under2' in self.schema)
+        self.assertNotIn('Folder2', self.schema)
+        self.assertNotIn('filed_under2', self.schema)
         self.mh.cmd_add_entity_type('Folder2')
         self.assertIn('Folder2', self.schema)
         self.assertIn('Old', self.schema)
@@ -253,7 +253,7 @@
         self.session.commit(free_cnxset=False)
         eschema = self.schema.eschema('Folder2')
         self.mh.cmd_drop_entity_type('Folder2')
-        self.assertFalse('Folder2' in self.schema)
+        self.assertNotIn('Folder2', self.schema)
         self.assertFalse(self.session.execute('CWEType X WHERE X name "Folder2"'))
         # test automatic workflow deletion
         self.assertFalse(self.session.execute('Workflow X WHERE NOT X workflow_of ET'))
@@ -277,7 +277,7 @@
                                 if not e.final and e != 'Old'))
         self.assertEqual(self.schema['filed_under2'].objects(), ('Folder2',))
         self.mh.cmd_drop_relation_type('filed_under2')
-        self.assertFalse('filed_under2' in self.schema)
+        self.assertNotIn('filed_under2', self.schema)
 
     def test_add_relation_definition_nortype(self):
         self.mh.cmd_add_relation_definition('Personne', 'concerne2', 'Affaire')
@@ -296,7 +296,7 @@
         self.mh.cmd_drop_relation_definition('Personne', 'concerne2', 'Affaire')
         self.assertIn('concerne2', self.schema)
         self.mh.cmd_drop_relation_definition('Personne', 'concerne2', 'Note')
-        self.assertFalse('concerne2' in self.schema)
+        self.assertNotIn('concerne2', self.schema)
 
     def test_drop_relation_definition_existant_rtype(self):
         self.assertEqual(sorted(str(e) for e in self.schema['concerne'].subjects()),
@@ -523,10 +523,10 @@
             try:
                 self.mh.cmd_remove_cube('email', removedeps=True)
                 # file was there because it's an email dependancy, should have been removed
-                self.assertFalse('email' in self.config.cubes())
-                self.assertFalse(self.config.cube_dir('email') in self.config.cubes_path())
-                self.assertFalse('file' in self.config.cubes())
-                self.assertFalse(self.config.cube_dir('file') in self.config.cubes_path())
+                self.assertNotIn('email', self.config.cubes())
+                self.assertNotIn(self.config.cube_dir('email'), self.config.cubes_path())
+                self.assertNotIn('file', self.config.cubes())
+                self.assertNotIn(self.config.cube_dir('file'), self.config.cubes_path())
                 for ertype in ('Email', 'EmailThread', 'EmailPart', 'File',
                                'sender', 'in_thread', 'reply_to', 'data_format'):
                     self.assertFalse(ertype in schema, ertype)
@@ -583,7 +583,7 @@
             try:
                 self.mh.cmd_remove_cube('email')
                 cubes.remove('email')
-                self.assertFalse('email' in self.config.cubes())
+                self.assertNotIn('email', self.config.cubes())
                 self.assertIn('file', self.config.cubes())
                 for ertype in ('Email', 'EmailThread', 'EmailPart',
                                'sender', 'in_thread', 'reply_to'):